B2G/QA/Git Commands

For a Gaia patch there are several ways that you can handle applying a patch.

1. 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:
   • git checkout -b <branch name>
   • ex git checkout -b Bug908513
2. you can pull the branch locally from a developer's git hub repo via :
   • git pull <their gaia.git repo> <branch name>
   • ex git pull https://github.com/davidflanagan/gaia.git bug989290-v1.3t
3. to see the branches available locally:
   • git branch
4. to switch branches:
   • git checkout <branch name>
   • ex git checkout master
5. to print log of commits in current branch:
   • git log
6. to delete a no longer used branch:
   • git branch -D <branch name>
   • ex. git branch -D bug_905831
7. adding a remote location:
   • git remote add nhirata nhirata@mozilla.com:nhirata/B2G.git
8. to cherry pick a commit, fetch the remote location and branch then cherry pick the commit. Cherry picking:
   • git fetch nhirata bug914179
   • git cherry-pick <SHA-COMMIT-ID>
9. Squashing commits ( http://davidwalsh.name/squash-commits-git )
   • git rebase -i master
   • <squash the other patches other than the head patch>
   • git push -f <repo> <branch>
10. To squash four commits into one, do the following:
    • $ git rebase -i HEAD~4
11. Revert a patch:
    • git revert ad049bb9cc6ba57839649726560955592352023a