Update contributing.md

This commit is contained in:
Olivier Lambert 2015-10-03 11:42:40 +02:00
parent ba5851969c
commit 75d7c2cdfb

View File

@ -32,5 +32,5 @@ to create a [GitHub pull request](https://help.github.com/articles/using-pull-re
1. Create a branch for your work
2. Create a pull request for this branch against the `next-release` branch
3. Push into the branch until the pull request is ready to merge
4. Avoid unnecessary merges: keep you branch up to date by regularly rebasing `git rebase origin next-release`
4. Avoid unnecessary merges: keep you branch up to date by regularly rebasing `git rebase origin/next-release`
5. When ready to merge, clean up the history (reorder commits, squash some of them together, rephrase messages): `git rebase -i`