diff options
author | Keller Fuchs <kellerfuchs@hashbang.sh> | 2016-05-13 09:51:01 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-13 12:37:44 -0700 |
commit | 05a5869a01779e6fb55535aff9b01716aac42dcf (patch) | |
tree | 3593816bac8244ba5810e80632c06e338ed0d116 /t/t3203-branch-output.sh | |
parent | Git 2.8 (diff) | |
download | tgif-05a5869a01779e6fb55535aff9b01716aac42dcf.tar.xz |
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>
Diffstat (limited to 't/t3203-branch-output.sh')
0 files changed, 0 insertions, 0 deletions