fast-import: Introduce --import-marks-if-exists

diff --git a/git-rebase.sh b/git-rebase.sh
index 3459fe4f60e99586dd6ce5490567afac0172cdf6..d8e190302668ca352fd58cd052a677347a29cdcd 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -206,6 +206,9 @@ do
        --no-verify)
                OK_TO_SKIP_PRE_REBASE=yes
                ;;
+       --verify)
+               OK_TO_SKIP_PRE_REBASE=
+               ;;
        --continue)
                test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
                        die "No rebase in progress?"