B2G/QA/Git Commands: Difference between revisions

← Older edit

B2G/QA/Git Commands (view source)

Revision as of 04:21, 5 August 2014

60 bytes added , 5 August 2014

no edit summary

Edwong

Confirmed users

964

edits

@@ Line 1: / Line 1: @@
 For a Gaia patch there are several ways that you can handle applying a patch.
-) Creating a new branch
+# Creating a new branch.  I recommend that you create a branch locally first for the changes that you are about to make.  You can do this by:
-I recommend that you create a branch locally first for the changes that you are about to make.  You can do this by:
+#* git checkout -b <branch name>
-* git checkout -b <branch name>
+#* ex git checkout -b Bug908513
-* ex git checkout -b Bug908513
+# you can pull the branch locally from a developer's git hub repo via :
+#* git pull <their gaia.git repo> <branch name>
-) you can pull the branch locally from a developer's git hub repo via :
+#* ex git pull https://github.com/davidflanagan/gaia.git bug989290-v1.3t
-* git pull <their gaia.git repo> <branch name>
+# to see the branches available locally:
-* ex git pull https://github.com/davidflanagan/gaia.git bug989290-v1.3t
+#* git branch
+# to switch branches:
-) to see the branches available locally:
+#* git checkout <branch name>
-* git branch
+#* ex git checkout master
+# to print log of commits in current branch:
-) to switch branches:
+#* git log
-* git checkout <branch name>
+# to delete a no longer used branch:
-* ex git checkout master
+#* git branch -D <branch name>
+#* ex. git branch -D bug_905831
-) to delete a no longer used branch:
+# adding a remote location:
-* git branch -D <branch name>
+#* git remote add nhirata nhirata@mozilla.com:nhirata/B2G.git
-* ex. git branch -D bug_905831
+# to cherry pick a commit, fetch the remote location and branch then cherry pick the commit.  Cherry picking:
+#* git fetch nhirata bug914179
-) adding a remote location:
+#* git cherry-pick <SHA-COMMIT-ID>
-git remote add nhirata nhirata@mozilla.com:nhirata/B2G.git
+# Squashing commits ( http://davidwalsh.name/squash-commits-git )
+#* git rebase -i master
-) to cherry pick a commit, fetch the remote location and branch then cherry pick the commit.
+#* <squash the other patches other than the head patch>
-Cherry picking:
+#* git push -f <repo> <branch>
-* git fetch nhirata bug914179
+# To squash four commits into one, do the following:
-* git cherry-pick <SHA-COMMIT-ID>
+#* $ git rebase -i HEAD~4
+# Revert a patch:
-) Squashing commits ( http://davidwalsh.name/squash-commits-git )
+#* git revert ad049bb9cc6ba57839649726560955592352023a
-git rebase -i master
-<squash the other patches other than the head patch>
-git push -f <repo> <branch>
-) To squash four commits into one, do the following:
-$ git rebase -i HEAD~4
-) Revert:
-Revert a patch:
-git revert ad049bb9cc6ba57839649726560955592352023a