diff options
| -rwxr-xr-x | git-commit-script | 3 |
1 files changed, 2 insertions, 1 deletions
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 |