Remove MERGE_HEAD in "git checkout/reset"

Both of these scripts will end up resetting the index to some specific
head, and any unresolved merge will be forgotten.

1 files changed, 2 insertions, 0 deletions

diff --git a/git-reset-script b/git-reset-script
index eaefd00d9d..fe773388c9 100755
--- a/git-reset-script
+++ b/git-reset-script
@@ -1,3 +1,5 @@
 #!/bin/sh
+: ${GIT_DIR=.git}
 git-read-tree --reset HEAD
 git-update-cache --refresh
+rm -f "$GIT_DIR/MERGE_HEAD"