Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Git.pm: Handle failed commands' output
[gitweb.git]
/
git-reset.sh
diff --git
a/git-reset.sh
b/git-reset.sh
index 296f3b779b5889e4f9e69f994587d70503e8b25e..46451d0d64bdff2c0061d100c8d3b3bd38c21454 100755
(executable)
--- a/
git-reset.sh
+++ b/
git-reset.sh
@@
-61,4
+61,4
@@
case "$reset_type" in
;;
esac
-rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR"
+rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR"
"$GIT_DIR/SQUASH_MSG"