Merge branch 'sg/gpg-sig'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 34a844582846ae409e17347a65ac6cbeb28202a5..2adccf8fec71c10f8223490f1be4b2a215ace5ea 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -84,6 +84,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