plone/plone.dotfiles — pull request #2 by jone (2013-01-26 15:48:28+00:00)
Title: Gitconfig: disable fast-forward merging

Disabling fast-forward merges creates merge-commits on "git merge" even when fast-forward merging (no merge-commit) would be possible.
This gives us an explicit git log where every merge is visible.
It does not impact "git pull".

At my company this configuration is mandatory, since we like to see all merges in the git log.