Remove MERGE_HEAD after committing merge

2005-06-08 13:44:32 -07:00 · 2005-06-08 13:44:32 -07:00 · 7f1d112962
parent 9c065315f7
commit 7f1d112962
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -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