Remove MERGE_HEAD after committing merge

7f1d1129 · Linus Torvalds · 9c065315 · 7f1d1129
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

git-commit-script git-commit-script +2 -1

未找到文件。
--- 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