[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

diff --git a/git-reset-script b/git-reset-script
index fe773388c9d55fdb87967bc04765fa94a83bf2c7..0c02aa6423ec485e19bd7439c926addbb8fd029d 100755 (executable)
--- 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"