projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Really honour NO_PYTHON
[git.git]
/
git-reset.sh
diff --git
a/git-reset.sh
b/git-reset.sh
index
6c9e58a
..
fe53fc8
100755
(executable)
--- a/
git-reset.sh
+++ b/
git-reset.sh
@@
-100,4
+100,4
@@
case "$reset_type" in
;;
esac
-rm -f "$GIT_DIR/MERGE_HEAD"
+rm -f "$GIT_DIR/MERGE_HEAD"
"$GIT_DIR/rr-cache/MERGE_RR"