X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset-script;h=fe773388c9d55fdb87967bc04765fa94a83bf2c7;hb=dade09c2269ec2117df085e8a99efcabccf08c53;hp=eaefd00d9d1e8adddb56040af0156d209815cc89;hpb=40d8cfe4117564e5520e8f4f953addaa94844476;p=git.git

diff --git a/git-reset-script b/git-reset-script
index eaefd00d..fe773388 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"