aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-12 21:49:51 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-12 21:49:51 -0800
commitcd425a1585bf0c1b92faa772b664dadd3294bf19 (patch)
tree55f250c9c27cf50298c7439a8ea2673d3f9e9553 /git-rebase.sh
parent6b236bfcb011048a4c2abc6b44290c738a3de699 (diff)
parent7baf9c4b70784920e05f9be6614084ef8f64674d (diff)
downloadgit-cd425a1585bf0c1b92faa772b664dadd3294bf19.tar.gz
git-cd425a1585bf0c1b92faa772b664dadd3294bf19.tar.xz
Merge branch 'mz/rebase-i-verify'
* mz/rebase-i-verify: rebase: support --verify
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 3459fe4f6..d8e190302 100755
--- 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?"