From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 20:44:32 +0000 (-0700)
Subject: Remove MERGE_HEAD after committing merge
X-Git-Tag: v0.99~305
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f1d1129628c63f46aebe03afacdb2ab259ef2d6;p=git.git

Remove MERGE_HEAD after committing merge
---

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