B2G/QA/Git Commands: Difference between revisions

From MozillaWiki
< B2G‎ | QA
Jump to navigation Jump to search
(Created page with "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...")
 
No edit summary
Line 1: Line 1:
For a Gaia patch there are several ways that you can handle applying a patch.
For a Gaia patch there are several ways that you can handle applying a patch.


1) Creating a new branch
# Creating a new branchI 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>
2) 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:
3) to see the branches available locally:
#* git checkout <branch name>
* git branch  
#* ex git checkout master
 
# to delete a no longer used branch:
4) to switch branches:
#* git branch -D <branch name>
* git checkout <branch name>
#* ex. git branch -D bug_905831
* ex git checkout master
# adding a remote location:
 
#* git remote add nhirata nhirata@mozilla.com:nhirata/B2G.git
5) to delete a no longer used branch:
# to cherry pick a commit, fetch the remote location and branch then cherry pick the commit. Cherry picking:
* git branch -D <branch name>
#* git fetch nhirata bug914179
* ex. git branch -D bug_905831
#* git cherry-pick <SHA-COMMIT-ID>
 
# Squashing commits ( http://davidwalsh.name/squash-commits-git )
6) adding a remote location:
#* git rebase -i master
git remote add nhirata nhirata@mozilla.com:nhirata/B2G.git
#* <squash the other patches other than the head patch>
 
#* git push -f <repo> <branch>
7) to cherry pick a commit, fetch the remote location and branch then cherry pick the commit.
# To squash four commits into one, do the following:
Cherry picking:
#* $ git rebase -i HEAD~4
* git fetch nhirata bug914179
# Revert a patch:
* git cherry-pick <SHA-COMMIT-ID>
#* git revert ad049bb9cc6ba57839649726560955592352023a
 
8) 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>
 
9) To squash four commits into one, do the following:
$ git rebase -i HEAD~4
 
10) Revert:
Revert a patch:
git revert ad049bb9cc6ba57839649726560955592352023a

Revision as of 16:29, 1 August 2014

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 :
  3. to see the branches available locally:
    • git branch
  4. to switch branches:
    • git checkout <branch name>
    • ex git checkout master
  5. to delete a no longer used branch:
    • git branch -D <branch name>
    • ex. git branch -D bug_905831
  6. adding a remote location:
    • git remote add nhirata nhirata@mozilla.com:nhirata/B2G.git
  7. 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>
  8. 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>
  9. To squash four commits into one, do the following:
    • $ git rebase -i HEAD~4
  10. Revert a patch:
    • git revert ad049bb9cc6ba57839649726560955592352023a