How do I make git merge's default be --no-ff --no-commit?

Question

Company policy is to use --no-ff for merge commits. I personally like to adjust merge log messages so I use --no-commit. Plus I like to actually co

Answer 1

As of version 1.7.6 of git, you should use

git config [--global] merge.ff no

to "force" using --no-ff in every merge.

Default behaviour is

git config [--global] merge.ff yes

And with

git config [--global] merge.ff only

it will refuse non-fast-forward merges