On Thu, Dec 01, 2016 at 02:27:17AM +0300, Andrew Savchenko wrote: > One more reason to use merge commits for pull requests: original > author commits with proper authorship will be retained. > > Yes, I know that some people are unhappy with non-linear history, > but this is how git works, so there is nothing wrong with merge > commits for user-contributed changes.
Hi Andrew, I don't see this subject as valid reason to prefer merge commits over rebases. Personally I prefer linear history and rebases. I had a commercial project in my practice which was based on Github, and other developers submitted pull requests. My workflow was to rebase the proposed changes onto mainline branch (which of course preserves authorship data), push the updated mainline branch to central repo, and close the PR manually. Not much of work, linear history, git metadata preserved.