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>
Keller Fuchs committed
May 13, 2016 at 09:51 UTC
05a5869a01779e6fb55535aff9b01716aac42dcf
2 files changed
+7
-4
Documentation/merge-options.txt
+5
-2
@@ -89,8 +89,11 @@ option can be used to override --squash.
89
90
--verify-signatures::
91
--no-verify-signatures::
92
- Verify that the commits being merged have good and trusted GPG signatures
93
- and abort the merge in case they do not.
92
+ Verify that the tip commit of the side branch being merged is
93
+ signed with a valid key, i.e. a key that has a valid uid: in the
94
+ default trust model, this means the signing key has been signed by
95
+ a trusted key. If the tip commit of the side branch is not signed
96
+ with a valid key, the merge is aborted.
97
98
--summary::
99
--no-summary::
Documentation/pretty-formats.txt
+2
-2
@@ -143,8 +143,8 @@ ifndef::git-rev-list[]
143
- '%N': commit notes
144
endif::git-rev-list[]
145
- '%GG': raw verification message from GPG for a signed commit
146
-- '%G?': show "G" for a Good signature, "B" for a Bad signature, "U" for a good,
147
- untrusted signature and "N" for no signature
146
+- '%G?': show "G" for a good (valid) signature, "B" for a bad signature,
147
+ "U" for a good signature with unknown validity and "N" for no signature
148
- '%GS': show the name of the signer for a signed commit
149
- '%GK': show the key used to sign a signed commit
150
- '%gD': reflog selector, e.g., `refs/stash@{1}`