Auto-tools/Projects/MozBase: Difference between revisions

Auto-tools/Projects/MozBase (view source)

Revision as of 22:20, 12 September 2012

44 bytes removed , 12 September 2012

→‎Landing the patch: update syntax

Jhammel

947

edits

@@ Line 371: / Line 371: @@
 '''Please never use the Github auto-merge feature!'''
-To land the patch on the target branch always make use of the '''git merge --squash''' command, which will land the patch as a single commit. After running this command you will have to issue a new commit message before being able to push the changes. Make sure that you add the right author if the patch hasn't been created by yourself. Also always use the right commit message format as shown below which includes the bug number and the list of reviewers.
+To land the patch on the target branch make use of the '''git merge --squash''' command, which will land the patch as a single commit. After running this command you will have to issue a new commit message before being able to push the changes. Make sure that you add the right author if the patch wasn't created by yourself. Also use the right commit message format as shown below which includes the bug number and the list of reviewers.
 Here an example how to land a patch from the '''feature''' branch onto '''master''':
@@ Line 377: / Line 377: @@
 * git checkout master
 * git checkout -b feature
-* git pull remote feature (or git am patch)
+* git pull remote feature # or git am patch
 * '''TEST''' the patch by [https://wiki.mozilla.org/Auto-tools/Projects/MozBase#Running_the_tests running existent tests]
 * git merge --squash feature
-* git commit -m "Bug XYZ - Add new feature to MozBase. r=reviewer" --author="foo <foo@bar" -a
+* git commit -a -m "Bug XYZ - Add new feature to MozBase;r=reviewer" --author="foo <foo@bar>"
-* git push upstream (whereby upstream is: git@github.com:mozilla/mozbase.git)
+* git push git@github.com:mozilla/mozbase.git master
 === Versioning ===