Possible duplicate:Can I do a quick redirect by default in git?
Is there a way to globally make git not perform quick merge switching by default? I keep forgetting to add --no-ff when I finish the function, and merge my function branch back into the mainline.
Yes. install merge.ff with git config. ( http://schacon.github.com/git/git-config.html )
git config merge.ff false
If you use Git on the command line, you should use aliases for common commands / options. This is the difference between making Git agonizing or helpful:
alias gm="git merge --no-ff"