diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 13:44:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 13:44:32 -0700 |
| commit | 7f1d1129628c63f46aebe03afacdb2ab259ef2d6 (patch) | |
| tree | da1b0ba8f3dc8a2177d75d25c4abd537edaa59fe | |
| parent | Make "git commit" work correctly in the presense of a manual merge (diff) | |
| download | tgif-7f1d1129628c63f46aebe03afacdb2ab259ef2d6.tar.xz | |
Remove MERGE_HEAD after committing merge
| -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 903c8dfabd..1abfa143ee 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 |