Merge branch 'mz/rebase-i-verify'

* mz/rebase-i-verify: rebase: support --verify
2010-12-12 21:49:51 -08:00
parent 6b236bfcb0 7baf9c4b70
commit cd425a1585
3 changed files with 9 additions and 0 deletions
--- 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?"