For people who still find this thread in Google, there is a way to do that
now:
*git config --add pull.ff only*
>From the documentation:
pull.ff
By default, Git does not create an extra merge commit when merging a
commit that is a descendant of the current commit. Instead, the tip of the
current branch is fast-forwarded. When set to false, this variable tells Git
to create an extra merge commit in such a case (equivalent to giving the
--no-ff option from the command line). When set to only, only such
fast-forward merges are allowed (equivalent to giving the --ff-only option
from the command line). This setting overrides merge.ff when pulling.
--
View this message in context: http://git.661346.n2.nabble.com/Use-git-pull-ff-only-by-default-tp5084103p7654696.html
Sent from the git mailing list archive at Nabble.com.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html