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

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 61876dbc335e240b8842aba3dd4e3fd8a54e574a..d6a9f4b96faaf2814b41a2ff79a49c9d4d899795 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -102,6 +102,12 @@ merge.
 +
 With --no-squash perform the merge and commit the result. This
 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>::