summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorKeller Fuchs <kellerfuchs@hashbang.sh>2016-05-13 09:51:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-13 19:37:44 (GMT)
commit05a5869a01779e6fb55535aff9b01716aac42dcf (patch)
tree3593816bac8244ba5810e80632c06e338ed0d116 /Documentation/merge-options.txt
parent90f7b16b3adc78d4bbabbd426fb69aa78c714f71 (diff)
downloadgit-05a5869a01779e6fb55535aff9b01716aac42dcf.zip
git-05a5869a01779e6fb55535aff9b01716aac42dcf.tar.gz
git-05a5869a01779e6fb55535aff9b01716aac42dcf.tar.bz2
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 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index f08e9b8..30808a0 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -89,8 +89,11 @@ option can be used to override --squash.
--verify-signatures::
--no-verify-signatures::
- Verify that the commits being merged have good and trusted GPG signatures
- and abort the merge in case they do not.
+ Verify that the tip commit of the side branch being merged is
+ signed with a valid key, i.e. a key that has a valid uid: in the
+ default trust model, this means the signing key has been signed by
+ a trusted key. If the tip commit of the side branch is not signed
+ with a valid key, the merge is aborted.
--summary::
--no-summary::