Code

Remove MERGE_HEAD after committing merge
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 20:44:32 +0000 (13:44 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 20:44:32 +0000 (13:44 -0700)
git-commit-script

index 903c8dfabd9a15053e249ac2909036cab1d2922e..1abfa143ee8fdc3896b9f05b6cc503675d735d4b 100755 (executable)
@@ -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