Difference between revisions of "Workflow of contributing code"
From KlayGE
Gongminmin (Talk | contribs) |
Gongminmin (Talk | contribs) |
||
| Line 1: | Line 1: | ||
== Guidelines == | == Guidelines == | ||
| − | # Work on your branch. For each feature or bug fix, it should create a branch before submitting a patch or pull request. | + | # '''Work on your branch'''. For each feature or bug fix, it should create a branch before submitting a patch or pull request. |
| − | # Always | + | # '''Always base on latest master branch'''. Use "git pull --rebase" to rewind your changes on top of master. |
| − | # Amend your commit. Prefer merge all your commits into one for one feature or bug fix. (git reset --soft "HEAD^", git commit --amend) | + | # '''Amend your commit'''. Prefer merge all your commits into one for one feature or bug fix. (git reset --soft "HEAD^", git commit --amend) |
[[zh:贡献代码的工作流]] | [[zh:贡献代码的工作流]] | ||
Revision as of 20:40, 24 March 2015
Guidelines
- Work on your branch. For each feature or bug fix, it should create a branch before submitting a patch or pull request.
- Always base on latest master branch. Use "git pull --rebase" to rewind your changes on top of master.
- Amend your commit. Prefer merge all your commits into one for one feature or bug fix. (git reset --soft "HEAD^", git commit --amend)
