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 |
---|---|---|
araxis | -rw-r--r-- | 392 bytes |
bc | -rw-r--r-- | 401 bytes |
bc3 | -rw-r--r-- | 24 bytes |
codecompare | -rw-r--r-- | 387 bytes |
deltawalker | -rw-r--r-- | 628 bytes |
diffmerge | -rw-r--r-- | 275 bytes |
diffuse | -rw-r--r-- | 282 bytes |
ecmerge | -rw-r--r-- | 340 bytes |
emerge | -rw-r--r-- | 404 bytes |
gvimdiff | -rw-r--r-- | 29 bytes |
gvimdiff2 | -rw-r--r-- | 29 bytes |
gvimdiff3 | -rw-r--r-- | 29 bytes |
kdiff3 | -rw-r--r-- | 488 bytes |
kompare | -rw-r--r-- | 83 bytes |
meld | -rw-r--r-- | 876 bytes |
opendiff | -rw-r--r-- | 301 bytes |
p4merge | -rw-r--r-- | 651 bytes |
tkdiff | -rw-r--r-- | 224 bytes |
tortoisemerge | -rw-r--r-- | 638 bytes |
vimdiff | -rw-r--r-- | 890 bytes |
vimdiff2 | -rw-r--r-- | 29 bytes |
vimdiff3 | -rw-r--r-- | 29 bytes |
winmerge | -rw-r--r-- | 823 bytes |
xxdiff | -rw-r--r-- | 618 bytes |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...