mozilla/webdev-bootcamp — Issue #12: explain "avoid merge commits"
Author: groovecoder
Created: 2011-10-11 15:06:13+00:00
State: open

Git doc says "Most projects avoid merge commits unless they are necessary." but doesn't explain how to do so. GitHub's merge button always generates a merge commit (https://github.com/blog/843-the-merge-button) so it would be helpful to explain how to merge pull requests without a merge commit. I *think* the process is like http://help.github.com/send-pull-requests/ but instead of

$ git fetch <remote>
$ git merge <remote>/<branch>

is it

$ git fetch <remote>
$ git pull --rebase <remote>/<branch>

?

Obviously I'm not the one to write the doc on it.