From 7838d9c2a9c246b6e59bcb4d48f70b919fe1f2c0 Mon Sep 17 00:00:00 2001 From: Greg Hurrell Date: Wed, 26 Jan 2022 13:14:25 +0100 Subject: [PATCH 1/2] Documentation/config/pgp.txt: replace stray character with Specifically, replace the tab between "the" and "first" with a space. Signed-off-by: Greg Hurrell Signed-off-by: Junio C Hamano --- Documentation/config/gpg.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index 0cb189a077..abfabd6d62 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -37,7 +37,7 @@ gpg.minTrustLevel:: gpg.ssh.defaultKeyCommand:: This command that will be run when user.signingkey is not set and a ssh signature is requested. On successful exit a valid ssh public key is - expected in the first line of its output. To automatically use the first + expected in the first line of its output. To automatically use the first available key from your ssh-agent set this to "ssh-add -L". gpg.ssh.allowedSignersFile:: From cbac0076ef03892dbd76b6039710487d4f4322df Mon Sep 17 00:00:00 2001 From: Greg Hurrell Date: Wed, 26 Jan 2022 13:14:26 +0100 Subject: [PATCH 2/2] Documentation/config/pgp.txt: add missing apostrophe Add an apostrophe to "signatures" to indicate the possessive relationship in "the signature's creation". Signed-off-by: Greg Hurrell Signed-off-by: Junio C Hamano --- Documentation/config/gpg.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index abfabd6d62..86892ada77 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -66,7 +66,7 @@ This way only committers with an already valid key can add or change keys in the + Since OpensSSH 8.8 this file allows specifying a key lifetime using valid-after & valid-before options. Git will mark signatures as valid if the signing key was -valid at the time of the signatures creation. This allows users to change a +valid at the time of the signature's creation. This allows users to change a signing key without invalidating all previously made signatures. + Using a SSH CA key with the cert-authority option