cherry-pick: detect bogus arguments to --mainline

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5e474e4a8584fc8ccfc7a638f9fb7a3e98f2c1e3..ca994c5c545cb0394fc5d355ecb6ea2fe5f1f193 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1041,7 +1041,7 @@ The possible behaviours are: ignore, warn, error.")"
                # placed before the commit of the next action
                checkout_onto
 
-               warn "$(gettext "You can fix this with 'git rebase --edit-todo'.")"
+               warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")"
                die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"
        fi
 }