Git merge without fast forward by default

Question

Possible Duplicate:
Can I make fast forwarding be off by default in git?

Is there any way to globally make git not do a fast forward merge by default? I keep forgetting to add --no-ff when I finish a feature and merge my feature branch back into mainline.

See [Can I make fast forwarding be off by default in git?](http://stackoverflow.com/questions/2500296/can-i-make-fast-forwarding-be-off-by-default-in-git) — Matthew Flaschen, Apr 19 '12 at 18:24

score 18 · Accepted Answer · answered Apr 19 '12 at 18:26

18

yes. set merge.ff with git config. ( http://schacon.github.com/git/git-config.html )

git config merge.ff false

answered Apr 19 '12 at 18:26

Matthias

3,458
4
27
46

score 2 · Answer 2 · answered Apr 19 '12 at 18:25

2

If you're using Git on the command line, you should be using aliases for common commands/options. They're the difference between making Git agonizing or useful:

alias gm="git merge --no-ff"

answered Apr 19 '12 at 18:25

user229044

232,980
40
330
338

This is just workaround. There is no effect if some 3'd party application try to merge. – skywinder Mar 12 '14 at 13:07
But it has the advantage of not affecting git pull – EdL Feb 18 '21 at 10:43

Git merge without fast forward by default

2 Answers2