X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-commit-script;h=1abfa143ee8fdc3896b9f05b6cc503675d735d4b;hb=1cc92ff6cab993c119a5d125a04a5a4e9cc4b09e;hp=903c8dfabd9a15053e249ac2909036cab1d2922e;hpb=9c065315f70fb1086ef16fc37e72e3edbaf3e919;p=git.git

diff --git a/git-commit-script b/git-commit-script
index 903c8dfab..1abfa143e 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -21,4 +21,5 @@ grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
 [ -s .cmitmsg ] || exit 1
 tree=$(git-write-tree) || exit 1
 commit=$(cat .cmitmsg | git-commit-tree $tree -p $PARENTS) || exit 1
-echo $commit > ${GIT_DIR:-.git}/HEAD
+echo $commit > $GIT_DIR/HEAD
+rm -f -- $GIT_DIR/MERGE_HEAD