conditional markdown preprocessing

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 94be34f9412557a7d4d30c8a0bfff6aa63e2176b..59b8ff1e51a5e173c208d1c8cd7fab71dcf37a2e 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -109,6 +109,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