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

To make --no-ff --no-commit the default merge behavior, set the options to no using:

git config --global merge.ff no
git config --global merge.commit no

However, the problem with this is that git pull = git fetch + git merge. So whenever you pull from the remote server, you'd be creating an ugly merge commit when a simple fast-forward would be warranted. To solve this, set pull.ff to yes:

git config --global pull.ff yes

Answer 2

Put this in $HOME/.gitconfig:

[merge]
    ff = no
    commit = no

You can use git-config to do this:

  git config --global merge.commit no
  git config --global merge.ff no

Answer 3

According to manual, you should use

$ git config [--global] merge.ff false

to set no-fast-forward option by default for all branches with git-config utility.

Answer 4

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