diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 124cb5846b0..59c148ff6d4 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -309,7 +309,7 @@ do_next () { squash|s) comment_for_reflog squash - has_action "$DONE" || + test -f "$DONE" && has_action "$DONE" || die "Cannot 'squash' without a previous commit" mark_action_done