Re: [PATCH] Documentation: a/an grammar fixes
Junio C Hamano <[email protected]> Wed, 29 Jul 2026 19:50:22 -0700
| Newsgroups | org.kernel.vger.git |
|---|---|
| Message-ID | <[email protected]> |
Ville Skyttä <[email protected]> writes: > This takes the stance that `*` is an asterisk rather than a star. > > Signed-off-by: Ville Skyttä <[email protected]> > --- As long as the changes do not contain an incorrect rewrite, it is OK even if the patch is not exhausitive. I went though the changes and did not spot anything questionable. But I think I can see a few more of the same kind. I didn't try to bee exhaustive, either, though. Documentation/config/gpg.adoc | 6 +++--- Documentation/git-push.adoc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git i/Documentation/config/gpg.adoc w/Documentation/config/gpg.adoc index 240e46c050..d4b8c1e570 100644 --- i/Documentation/config/gpg.adoc +++ w/Documentation/config/gpg.adoc @@ -38,7 +38,7 @@ gpg.minTrustLevel:: * `ultimate` gpg.ssh.defaultKeyCommand:: - This command will be run when user.signingkey is not set and a ssh + This command will be run when user.signingkey is not set and an ssh signature is requested. On successful exit a valid ssh public key prefixed with `key::` is expected in the first line of its output. This allows for a script doing a dynamic lookup of the correct public @@ -75,11 +75,11 @@ valid-before options. Git will mark signatures as valid if the signing key was 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 +Using an SSH CA key with the cert-authority option (see ssh-keygen(1) "CERTIFICATES") is also valid. gpg.ssh.revocationFile:: - Either a SSH KRL or a list of revoked public keys (without the principal prefix). + Either an SSH KRL or a list of revoked public keys (without the principal prefix). See ssh-keygen(1) for details. If a public key is found in this file then it will always be treated as having trust level "never" and signatures will show as invalid. diff --git i/Documentation/git-push.adoc w/Documentation/git-push.adoc index aa221c3909..d05e6020a5 100644 --- i/Documentation/git-push.adoc +++ w/Documentation/git-push.adoc @@ -105,7 +105,7 @@ as well as various other special refspec forms: directs Git to push "matching" branches: for every branch that exists on the local side, the remote side is updated if a branch of the same name already exists on the remote side. - * _<src>_ may contain a `*` to indicate a simple pattern match. + * _<src>_ may contain an `*` to indicate a simple pattern match. This works like a glob that matches any ref matching the pattern. There must be only one `*` in both the `<src>` and `<dst>`. It will map refs to the destination by replacing the * with the