summaryrefslogtreecommitdiff
path: root/Documentation
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 /Documentation
parent6b236bfcb011048a4c2abc6b44290c738a3de699 (diff)
parent7baf9c4b70784920e05f9be6614084ef8f64674d (diff)
downloadgit-cd425a1585bf0c1b92faa772b664dadd3294bf19.tar.gz
Merge branch 'mz/rebase-i-verify'
* mz/rebase-i-verify: rebase: support --verify
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rebase.txt4
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