X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-reset-script;h=fe773388c9d55fdb87967bc04765fa94a83bf2c7;hb=d0587fd59f4452ed8461416d21bc7e47378e70b3;hp=eaefd00d9d1e8adddb56040af0156d209815cc89;hpb=40d8cfe4117564e5520e8f4f953addaa94844476;p=git.git

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