{"thread":{"id":"66084","subject":"[PATCH] Documentation: a/an grammar fixes","startedAt":"2026-07-29T18:23:51Z","lastAt":"2026-07-30T02:50:25Z","messageCount":2,"participants":["Ville Skyttä","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"549226","messageId":"20260729182323.1095474-1-ville.skytta@iki.fi","threadId":"66084","inReplyTo":null,"subject":"[PATCH] Documentation: a/an grammar fixes","fromName":"Ville Skyttä","fromEmail":"ville.skytta@iki.fi","sentAt":"2026-07-29T18:23:23Z","receivedAt":"2026-07-29T18:23:51Z","isPatch":true,"body":"This takes the stance that `*` is an asterisk rather than a star.\n\nSigned-off-by: Ville Skyttä <ville.skytta@iki.fi>\n---\n Documentation/blame-options.adoc       | 2 +-\n Documentation/config/blame.adoc        | 2 +-\n Documentation/config/http.adoc         | 2 +-\n Documentation/config/promisor.adoc     | 2 +-\n Documentation/git-merge.adoc           | 2 +-\n Documentation/git-sparse-checkout.adoc | 2 +-\n Documentation/gitprotocol-v2.adoc      | 2 +-\n Documentation/pull-fetch-param.adoc    | 2 +-\n Documentation/rev-list-options.adoc    | 2 +-\n 9 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/blame-options.adoc b/Documentation/blame-options.adoc\nindex 1ae1222b6b..977d5f871f 100644\n--- a/Documentation/blame-options.adoc\n+++ b/Documentation/blame-options.adoc\n@@ -126,7 +126,7 @@ take effect.\n \tanother commit will be marked with a `?` in the blame output.  If the\n \t`blame.markUnblamableLines` config option is set, then those lines touched\n \tby an ignored commit that we could not attribute to another revision are\n-\tmarked with a `*`. In the porcelain modes, we print `ignored` and\n+\tmarked with an `*`. In the porcelain modes, we print `ignored` and\n \t`unblamable` on a newline respectively.\n \n `--ignore-revs-file <file>`::\ndiff --git a/Documentation/config/blame.adoc b/Documentation/config/blame.adoc\nindex 4d047c1790..5ac120d9da 100644\n--- a/Documentation/config/blame.adoc\n+++ b/Documentation/config/blame.adoc\n@@ -29,7 +29,7 @@ blame.ignoreRevsFile::\n \n blame.markUnblamableLines::\n \tMark lines that were changed by an ignored revision that we could not\n-\tattribute to another commit with a '*' in the output of\n+\tattribute to another commit with an '*' in the output of\n \tlinkgit:git-blame[1].\n \n blame.markIgnoredLines::\ndiff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc\nindex 792a71b413..369ac2cd88 100644\n--- a/Documentation/config/http.adoc\n+++ b/Documentation/config/http.adoc\n@@ -388,7 +388,7 @@ http.<url>.*::\n \n . Host/domain name (e.g., `example.com` in `https://example.com/`).\n   This field must match between the config key and the URL. It is\n-  possible to specify a `*` as part of the host name to match all subdomains\n+  possible to specify an `*` as part of the host name to match all subdomains\n   at this level. `https://*.example.com/` for example would match\n   `https://foo.example.com/`, but not `https://foo.bar.example.com/`.\n \ndiff --git a/Documentation/config/promisor.adoc b/Documentation/config/promisor.adoc\nindex c1f3d766a6..e80435f632 100644\n--- a/Documentation/config/promisor.adoc\n+++ b/Documentation/config/promisor.adoc\n@@ -126,7 +126,7 @@ guidelines:\n    the latter matches `https://cdn.your-org.com.hacker.net/repo`.\n +\n 4. Be careful using globs at the beginning of domain names. While the\n-   code ensures a `*` in the host cannot cross into the path, a\n+   code ensures an `*` in the host cannot cross into the path, a\n    pattern like `https://*.example.com/*` will still match any\n    subdomain. This is extremely dangerous on shared hosting platforms\n    (e.g., `https://*.github.io/*` trusts every user's site on the\ndiff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc\nindex a055384ad6..899330ff9f 100644\n--- a/Documentation/git-merge.adoc\n+++ b/Documentation/git-merge.adoc\n@@ -329,7 +329,7 @@ After seeing a conflict, you can do two things:\n    the working tree.  Edit the files into shape and\n    `git add` them to the index.  Use `git commit` or\n    `git merge --continue` to seal the deal. The latter command\n-   checks whether there is a (interrupted) merge in progress\n+   checks whether there is an (interrupted) merge in progress\n    before calling `git commit`.\n \n You can work through the conflict with a number of tools:\ndiff --git a/Documentation/git-sparse-checkout.adoc b/Documentation/git-sparse-checkout.adoc\nindex e286584c67..d30168721a 100644\n--- a/Documentation/git-sparse-checkout.adoc\n+++ b/Documentation/git-sparse-checkout.adoc\n@@ -331,7 +331,7 @@ wasn't transliterated.\n Second, what should bash-completion complete on for set/add commands\n for non-cone users?  If it suggests paths, is it exacerbating the\n problem above?  Also, if it suggests paths, what if the user has a\n-file or directory that begins with either a '!' or '#' or has a '*',\n+file or directory that begins with either a '!' or '#' or has an '*',\n '\\', '?', '[', or ']' in its name?  And if it suggests paths, will\n it complete \"/pro\" to \"/proc\" (in the root filesystem) rather than to\n \"/progress.txt\" in the current directory?  (Note that users are\ndiff --git a/Documentation/gitprotocol-v2.adoc b/Documentation/gitprotocol-v2.adoc\nindex 2beb70595f..16d60597f9 100644\n--- a/Documentation/gitprotocol-v2.adoc\n+++ b/Documentation/gitprotocol-v2.adoc\n@@ -772,7 +772,7 @@ be implemented in the future include:\n  * Advertise that one or more bundle files are the same (to e.g. have\n    clients round-robin or otherwise choose one of N possible files).\n \n- * A \"oid=<OID>\" shortcut and \"prerequisite=<OID>\" shortcut. For\n+ * An \"oid=<OID>\" shortcut and \"prerequisite=<OID>\" shortcut. For\n    expressing the common case of a bundle with one tip and no\n    prerequisites, or one tip and one prerequisite.\n +\ndiff --git a/Documentation/pull-fetch-param.adoc b/Documentation/pull-fetch-param.adoc\nindex d903dc8900..401e6edcad 100644\n--- a/Documentation/pull-fetch-param.adoc\n+++ b/Documentation/pull-fetch-param.adoc\n@@ -32,7 +32,7 @@ typically a ref, or a glob pattern with a single `*` that is used\n to match a set of refs, but it can also be a fully spelled hex object\n name.\n +\n-A _<refspec>_ may contain a `*` in its _<src>_ to indicate a simple pattern\n+A _<refspec>_ may contain an `*` in its _<src>_ to indicate a simple pattern\n match. Such a refspec functions like a glob that matches any ref with the\n pattern. A pattern _<refspec>_ must have one and only one `*` in both the _<src>_ and\n _<dst>_. It will map refs to the destination by replacing the `*` with the\ndiff --git a/Documentation/rev-list-options.adoc b/Documentation/rev-list-options.adoc\nindex fd831f0ec6..c856576f5b 100644\n--- a/Documentation/rev-list-options.adoc\n+++ b/Documentation/rev-list-options.adoc\n@@ -1139,7 +1139,7 @@ e.g. ``2 hours ago''. The `-local` option has no effect for\n \n `--date=local` is an alias for `--date=default-local`.\n \n-`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format.\n+`--date=iso` (or `--date=iso8601`) shows timestamps in an ISO 8601-like format.\n The differences to the strict ISO 8601 format are:\n \n \t- a space instead of the `T` date/time delimiter\n-- \n2.53.0\n\n"},{"id":"549254","messageId":"xmqqtsphmbrl.fsf@gitster.g","threadId":"66084","inReplyTo":"20260729182323.1095474-1-ville.skytta@iki.fi","subject":"Re: [PATCH] Documentation: a/an grammar fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-07-30T02:50:22Z","receivedAt":"2026-07-30T02:50:25Z","isPatch":true,"body":"Ville Skyttä <ville.skytta@iki.fi> writes:\n\n> This takes the stance that `*` is an asterisk rather than a star.\n>\n> Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>\n> ---\n\nAs long as the changes do not contain an incorrect rewrite, it is OK\neven if the patch is not exhausitive.  I went though the changes and\ndid not spot anything questionable.\n\nBut I think I can see a few more of the same kind.  I didn't try to\nbee exhaustive, either, though.\n\n Documentation/config/gpg.adoc | 6 +++---\n Documentation/git-push.adoc   | 2 +-\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git i/Documentation/config/gpg.adoc w/Documentation/config/gpg.adoc\nindex 240e46c050..d4b8c1e570 100644\n--- i/Documentation/config/gpg.adoc\n+++ w/Documentation/config/gpg.adoc\n@@ -38,7 +38,7 @@ gpg.minTrustLevel::\n * `ultimate`\n \n gpg.ssh.defaultKeyCommand::\n-\tThis command will be run when user.signingkey is not set and a ssh\n+\tThis command will be run when user.signingkey is not set and an ssh\n \tsignature is requested. On successful exit a valid ssh public key\n \tprefixed with `key::` is expected in the first line of its output.\n \tThis allows for a script doing a dynamic lookup of the correct public\n@@ -75,11 +75,11 @@ valid-before options. Git will mark signatures as valid if the signing key was\n valid at the time of the signature's creation. This allows users to change a\n signing key without invalidating all previously made signatures.\n +\n-Using a SSH CA key with the cert-authority option\n+Using an SSH CA key with the cert-authority option\n (see ssh-keygen(1) \"CERTIFICATES\") is also valid.\n \n gpg.ssh.revocationFile::\n-\tEither a SSH KRL or a list of revoked public keys (without the principal prefix).\n+\tEither an SSH KRL or a list of revoked public keys (without the principal prefix).\n \tSee ssh-keygen(1) for details.\n \tIf a public key is found in this file then it will always be treated\n \tas having trust level \"never\" and signatures will show as invalid.\ndiff --git i/Documentation/git-push.adoc w/Documentation/git-push.adoc\nindex aa221c3909..d05e6020a5 100644\n--- i/Documentation/git-push.adoc\n+++ w/Documentation/git-push.adoc\n@@ -105,7 +105,7 @@ as well as various other special refspec forms:\n     directs Git to push \"matching\" branches: for every branch that exists on\n     the local side, the remote side is updated if a branch of the same name\n     already exists on the remote side.\n- *  _<src>_ may contain a `*` to indicate a simple pattern match.\n+ *  _<src>_ may contain an `*` to indicate a simple pattern match.\n     This works like a glob that matches any ref matching the pattern.\n     There must be only one `*` in both the `<src>` and `<dst>`.\n     It will map refs to the destination by replacing the * with the\n"}]}