aboutsummaryrefslogtreecommitdiff
path: root/git-reset-script
diff options
context:
space:
mode:
Diffstat (limited to 'git-reset-script')
-rwxr-xr-xgit-reset-script2
1 files changed, 2 insertions, 0 deletions
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"