Revision 05a5869a01779e6fb55535aff9b01716aac42dcf authored by Keller Fuchs on 13 May 2016, 09:51:01 UTC, committed by Junio C Hamano on 13 May 2016, 19:37:44 UTC
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>
1 parent 90f7b16
| File | Mode | Size |
|---|---|---|
| lib | ||
| macosx | ||
| po | ||
| windows | ||
| .gitattributes | -rw-r--r-- | 170 bytes |
| .gitignore | -rw-r--r-- | 97 bytes |
| GIT-VERSION-GEN | -rwxr-xr-x | 1.8 KB |
| Makefile | -rw-r--r-- | 11.4 KB |
| git-gui--askpass | -rwxr-xr-x | 1.3 KB |
| git-gui.sh | -rwxr-xr-x | 98.3 KB |
Computing file changes ...
