Git merge doesn't use default merge message, opens editor with default message

Question

How can I force git merge to use the default merge message instead of loading my editor with said message?

I have no editor listed in git config -

Answer 1

This is a new feature of Git, introduced in Git 1.7.10, to use the old one (don't provide a message on merge) put these two lines in your .bash_profile or .bashrc

GIT_MERGE_AUTOEDIT=no
export GIT_MERGE_AUTOEDIT