Merge branch 'js/rebase-i-dedup-call-to-rerere'

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index dfb43d000fa8f539a99bae771fca87abfd46e507..5b4a62e93624bc8289c835631aab5d5f13dff708 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -89,8 +89,11 @@ option can be used to override --squash.
 
 --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.
+       Verify that the tip commit of the side branch being merged is
+       signed with a valid key, i.e. a key that has a valid uid: in the
+       default trust model, this means the signing key has been signed by
+       a trusted key.  If the tip commit of the side branch is not signed
+       with a valid key, the merge is aborted.
 
 --summary::
 --no-summary::