Merge branches 'jc/nostat' and 'jc/empty-commit'

[git.git] / git-reset.sh

diff --git a/git-reset.sh b/git-reset.sh
index 6c9e58ad9a727ab5091b0de02e089b82cb8331dd..fe53fc8065dc82c0054ba9891b28a00b0752bf87 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"