X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=git-reset-script;h=0c02aa6423ec485e19bd7439c926addbb8fd029d;hb=ab90ea5d6e6ef358c8ee5869307c33a939be0e66;hp=fe773388c9d55fdb87967bc04765fa94a83bf2c7;hpb=ef0bfa25e99627b809c0902d21072821955db3fe;p=git.git diff --git a/git-reset-script b/git-reset-script index fe773388..0c02aa64 100755 --- a/git-reset-script +++ b/git-reset-script @@ -1,5 +1,5 @@ #!/bin/sh -: ${GIT_DIR=.git} +. git-sh-setup-script || die "Not a git archive" git-read-tree --reset HEAD git-update-cache --refresh rm -f "$GIT_DIR/MERGE_HEAD"