Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 30e5c0eb14470a5f72174b1071eac79c55fb0c41..96680c84561c434c4cf3a00cfe958b21f18a3d8d 100644 (file)
--- 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