Merge branch 'jt/avoid-ls-refs-with-http'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 79a00d2a4abd6f7191f2639185e199fa85f6289b..d6a9f4b96faaf2814b41a2ff79a49c9d4d899795 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -105,6 +105,10 @@ option can be used to override --squash.
 +
 With --squash, --commit is not allowed, and will fail.
 
+--no-verify::
+       This option bypasses the pre-merge and commit-msg hooks.
+       See also linkgit:githooks[5].
+
 -s <strategy>::
 --strategy=<strategy>::
        Use the given merge strategy; can be supplied more than