Merge branch 'kf/gpg-sig-verification-doc'
commitbe6ec17822e523ef4700c612f1ec2baedacd1227
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:39 +0000 (17 14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:39 +0000 (17 14:38 -0700)
tree6606e98fc8a60309c004170a9356f1f9da39d16b
parentbfc99b63fe859e16ddcfcbe6ac09f98b8d06b34e
parent05a5869a01779e6fb55535aff9b01716aac42dcf
Merge branch 'kf/gpg-sig-verification-doc'

Documentation for "git merge --verify-signatures" has been updated
to clarify that the signature of only the commit at the tip is
verified.  Also the phrasing used for signature and key validity is
adjusted to align with that used by OpenPGP.

* kf/gpg-sig-verification-doc:
  Documentation: clarify signature verification
Documentation/merge-options.txt