thoughtbot/dotfiles — pull request #181 by gylaz (2013-08-03 17:50:58+00:00)
Title: Remove `merge.ff=only` setting

* add `git ff` alias that does the same thing

It's not possible to do a non-ff merge when `merge.ff=only` is set.
There are certain situations (like merging from upsteam repo) when
merging without ff is desirable.