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.
yes. set merge.ff with git config. ( http://schacon.github.com/git/git-config.html )