Merge branch 'maint'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f192cd2e1622ff59c48f73b18a7114562074e1f7..afba8d4f3b2dcc952310c270daf26e01f8b30800 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -85,6 +85,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