Confirmed users
955
edits
Auto-tools/Projects/MozBase: Difference between revisions
→Working on Mozbase and Contributing Patches
| Line 313: | Line 313: | ||
* ''Develop your patch'' | * ''Develop your patch'' | ||
* If people commit work to the master branch while you're working on your patch, you can make things up to date by issuing the following commands from your checked out branch: | |||
git pull origin master | |||
git rebase master | |||
* When you're happy with your work, commit your changes, giving them a descriptive title from the bug summary: | * When you're happy with your work, commit your changes, giving them a descriptive title from the bug summary: | ||
| Line 322: | Line 327: | ||
git show --format="From: %an <%ae>%n%s%n%b" > bug-xxxx.patch | git show --format="From: %an <%ae>%n%s%n%b" > bug-xxxx.patch | ||
* Attach the patch to the bug and ask the appropriate person for review. If further changes are required, you can amend changes to your patch by using 'git commit --amend'. When you're all done, | * Attach the patch to the bug and ask the appropriate person for review. If further changes are required, you can amend changes to your patch by using 'git commit --amend'. When you're all done, ask someone with mozbase commit privileges to merge your changes into the mozilla mozbase repository. | ||
This is a recommended way of working with mozbase. In general the important things are: | This is a recommended way of working with mozbase. In general the important things are: | ||