canmove, Confirmed users
227
edits
Gaia/UX Branch: Difference between revisions
Jump to navigation
Jump to search
→Etiquette: Added tutorial on squashing.
(→Etiquette: Added tutorial on rebase from Gitready.) |
(→Etiquette: Added tutorial on squashing.) |
||
| Line 28: | Line 28: | ||
* Create a local branch for each bug: `git branch issue-xxxxx`. | * Create a local branch for each bug: `git branch issue-xxxxx`. | ||
* Each commit message must start with the bug #: `Bug xxxxx - My Message`. | * Each commit message must start with the bug #: `Bug xxxxx - My Message`. | ||
* Rebase changes in your bug branch before issuing a pull request to `gordonbrander/ux`. See http://git-scm.com/book/en/Git-Branching-Rebasing and http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html. We should be merging one commit per fix so that fixes can be easily cherry-picked. | * Rebase changes in your bug branch before issuing a pull request to `gordonbrander/ux`. See http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html, http://git-scm.com/book/en/Git-Branching-Rebasing and http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html. We should be merging one commit per fix so that fixes can be easily cherry-picked. | ||
* Create a patch (diff file): `git diff > issue-xxxxx.diff`. Attach it to the bug. | * Create a patch (diff file): `git diff > issue-xxxxx.diff`. Attach it to the bug. | ||
* Follow any code style guidelines. | * Follow any code style guidelines. | ||