Sync with maint

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 31f106752152ea0a915ceaea148cf4cad555de99..2adccf8fec71c10f8223490f1be4b2a215ace5ea 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -30,7 +30,8 @@ set to `no` at the beginning of them.
 
 --no-ff::
        Create a merge commit even when the merge resolves as a
-       fast-forward.
+       fast-forward.  This is the default behaviour when merging an
+       annotated (and possibly signed) tag.
 
 --ff-only::
        Refuse to merge and exit with a non-zero status unless the
@@ -85,8 +86,8 @@ option can be used to override --squash.
 
 --verify-signatures::
 --no-verify-signatures::
-       Verify that the commits being merged have good GPG signatures and abort the
-       merge in case they do not.
+       Verify that the commits being merged have good and trusted GPG signatures
+       and abort the merge in case they do not.
 
 --summary::
 --no-summary::