diff options
author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2010-11-22 23:21:01 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-23 23:15:43 +0300 |
commit | 7baf9c4b70784920e05f9be6614084ef8f64674d (patch) | |
tree | 0de47728ff649e48a902d33ea447206802835043 /Documentation/git-rebase.txt | |
parent | 03276d94bcdb7d463a029936933898948c0669ac (diff) |
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 'Documentation/git-rebase.txt')
-rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 30e5c0eb14..96680c8456 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -279,6 +279,10 @@ which makes little sense. --no-verify:: This option bypasses the pre-rebase hook. See also linkgit:githooks[5]. +--verify:: + Allows the pre-rebase hook to run, which is the default. This option can + be used to override --no-verify. See also linkgit:githooks[5]. + -C<n>:: Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding |