Merge branch 'jk/pack-bitmap'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index d462bcc4c31595a93834d58f2e462b91bc53bfdc..e1343155fad7b2709d2f3700ea3d5b4c4d1a7a89 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -88,6 +88,11 @@ option can be used to override --squash.
        Pass merge strategy specific option through to the merge
        strategy.
 
+--verify-signatures::
+--no-verify-signatures::
+       Verify that the commits being merged have good and trusted GPG signatures
+       and abort the merge in case they do not.
+
 --summary::
 --no-summary::
        Synonyms to --stat and --no-stat; these are deprecated and will be