Merge commits are great. But some projects want and/or require linear
histories. git flow is still a great tool for them, they just need to
fast forward instead of merge commit.
This patch allows the default behavior of merge commits to remain while
supporting projects that need the other style.