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

1  2 
Documentation/merge-options.txt
Simple merge