git-am: Add --ignore-date option

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 14d3e389f58312df2f1484d35ce35e74a7df04fc..21ac20c3056062892f938297f44c7e82145e2b61 100755 (executable)
--- 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