projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove MERGE_HEAD after committing merge
[git.git]
/
git-commit-script
diff --git
a/git-commit-script
b/git-commit-script
index
903c8df
..
1abfa14
100755
(executable)
--- 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