summaryrefslogtreecommitdiff
path: root/git-reset.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-reset.sh')
-rwxr-xr-xgit-reset.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-reset.sh b/git-reset.sh
index 296f3b779b..46451d0d64 100755
--- 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"