diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-12 03:55:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-12 03:55:58 +0300 |
| commit | c46452eb989a61ce76e24bb74b7f2c9a2efe6083 (patch) | |
| tree | 998f75f8bee76f54064d37576c6ba11fa46c7f9e | |
| parent | e66e9906e644ada571a6fd1e044503d292850574 (diff) | |
| parent | cbac0076ef03892dbd76b6039710487d4f4322df (diff) | |
Merge branch 'gh/doc-typos'
Typofix.
* gh/doc-typos:
Documentation/config/pgp.txt: add missing apostrophe
Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>
| -rw-r--r-- | Documentation/config/gpg.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index 0cb189a077..86892ada77 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:: @@ -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 |