| commit | 05a5869a01779e6fb55535aff9b01716aac42dcf | |
| author | Keller Fuchs <kellerfuchs@hashbang.sh> | |
| Fri, 13 May 2016 09:51:01 +0000 (13 09:51 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2016 19:37:44 +0000 (13 12:37 -0700) | ||
| tree | 3593816bac8244ba5810e80632c06e338ed0d116 | treesnapshot (tar.gz zip) |
| parent | 90f7b16b3adc78d4bbabbd426fb69aa78c714f71 | commitdiff |
Documentation: clarify signature verification
Clarify that "merge --verify-signatures" checks the signature on the
tip commit of the history being merged.
Uniformise the vocabulary used wrt. key/signature validity with OpenPGP:
- a signature is valid if made by a key with a valid uid;
- in the default trust-model, a uid is valid if signed by a trusted key;
- a key is trusted if the (local) user set a trust level for it.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Keller Fuchs <KellerFuchs@hashbang.sh>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clarify that "merge --verify-signatures" checks the signature on the
tip commit of the history being merged.
Uniformise the vocabulary used wrt. key/signature validity with OpenPGP:
- a signature is valid if made by a key with a valid uid;
- in the default trust-model, a uid is valid if signed by a trusted key;
- a key is trusted if the (local) user set a trust level for it.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Keller Fuchs <KellerFuchs@hashbang.sh>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-options.txt | diffblobblamehistory | |
| Documentation/pretty-formats.txt | diffblobblamehistory |