Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Add explanation on the git rebase workflow.

This commit is contained in:
Yago González 2017-01-22 12:49:43 +00:00 committed by Tim Abbott
parent f83da697ee
commit 8ee8118328
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/git-guide.md
View File

@ -22,6 +22,11 @@ with these details in mind:
as needed thereafter. If you're unfamiliar with how to rebase a pull request,
[read this excellent guide][github-rebase-pr].
We use this strategy in order to avoid the extra commits that appear when
another branch is merged, that clutter the commit history. A side effect is
that the pull requests we merge appear as *closed* instead of *merged*,
since GitHub is unable to identify this approach.
- We have a **[code style guide][zulip-rtd-code-style]**, a **[commit message
guide][zulip-rtd-commit-messages]**, and strive for each commit to be *a
minimal coherent idea* (see **[commit