Luben Tuikov <ltuikov@xxxxxxxxx> writes: > --- a/git-commit.sh > +++ b/git-commit.sh > @@ -441,7 +441,7 @@ then > elif test "$use_commit" != "" > then > git-cat-file commit "$use_commit" | sed -e '1,/^$/d' > -elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG" > +elif test -f "$GIT_DIR/MERGE_MSG" > then > cat "$GIT_DIR/MERGE_MSG" > elif test -f "$GIT_DIR/SQUASH_MSG" If you rely on MERGE_MSG then you would need to clean it after commit is done. Currently it does not and checks MERGE_HEAD, and cleans up MERGE_HEAD when it is done. MERGE_MSG is not cleaned. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html