This article is _awesome_. I've tried to explain this before, this is how I develop in my startup, too.<p>&#62; Unfortunately, I have not found a way to make --no-ff the default behaviour of git merge yet, but it really should be.<p><pre><code>    git config branch.&#60;branchname&#62;.mergeoptions --no-ff
</code></pre>
I believe this is what you want.