修改git merge默认行为:no-ff no-commit
$HOME/.gitconfig:
[merge]
ff = false # 保留原有分支
commit = false
或者手工:
git config –global merge.commit false
git config –global merge.ff false
参考:
- http://stackoverflow.com/questions/5519007/how-do-i-make-git-merges-default-be-no-ff-no-commit/10633995
- http://stackoverflow.com/questions/14531054/git-flow-release-finish-with-a-message-that-contains-spaces
- http://www.oschina.net/translate/a-successful-git-branching-model
- http://blog.jobbole.com/100264/