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

diff --git a/git-reset-script b/git-reset-script
index eaefd00d..0c02aa64 100755
--- a/git-reset-script
+++ b/git-reset-script
@@ -1,3 +1,5 @@
 #!/bin/sh
+. git-sh-setup-script || die "Not a git archive"
 git-read-tree --reset HEAD
 git-update-cache --refresh
+rm -f "$GIT_DIR/MERGE_HEAD"