diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-13 05:49:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-13 05:49:51 (GMT) |
| commit | cd425a1585bf0c1b92faa772b664dadd3294bf19 (patch) | |
| tree | 55f250c9c27cf50298c7439a8ea2673d3f9e9553 /git-rebase.sh | |
| parent | 6b236bfcb011048a4c2abc6b44290c738a3de699 (diff) | |
| parent | 7baf9c4b70784920e05f9be6614084ef8f64674d (diff) | |
| download | git-cd425a1585bf0c1b92faa772b664dadd3294bf19.zip git-cd425a1585bf0c1b92faa772b664dadd3294bf19.tar.gz git-cd425a1585bf0c1b92faa772b664dadd3294bf19.tar.bz2 | |
Merge branch 'mz/rebase-i-verify'
* mz/rebase-i-verify:
rebase: support --verify
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 3459fe4..d8e1903 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?" |