X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase--interactive.sh;h=21ac20c3056062892f938297f44c7e82145e2b61;hb=35fb0e8633217f602360a9987af51c4b960e7850;hp=14d3e389f58312df2f1484d35ce35e74a7df04fc;hpb=d911d1465d134cbd126e531a544f33b13f4e855a;p=git.git diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 14d3e389f..21ac20c30 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -362,7 +362,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