diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2010-11-22 21:21:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-23 12:15:43 -0800 |
| commit | 7baf9c4b70784920e05f9be6614084ef8f64674d (patch) | |
| tree | 0de47728ff649e48a902d33ea447206802835043 /git-rebase.sh | |
| parent | 03276d94bcdb7d463a029936933898948c0669ac (diff) | |
| download | git-7baf9c4b70784920e05f9be6614084ef8f64674d.tar.gz git-7baf9c4b70784920e05f9be6614084ef8f64674d.tar.xz | |
rebase: support --verify
Interactive rebase allows the '--verify' option to be passed, but it will
be ignored. Implement proper support for the option for both interactive
and non-interactive rebase by making it override any previous
'--no-verify'.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 10a238ae3..7548f0cae 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -205,6 +205,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?" |