{"thread":{"id":"64026","subject":"[PATCH] doc: config: replace backtick with apostrophe for possessive","startedAt":"2025-08-24T19:47:15Z","lastAt":"2025-08-25T20:21:42Z","messageCount":2,"participants":["kristofferhaugsbakk@fastmail.com","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"524851","messageId":"3ec6a00e3046166c7adb593f38c4099921d8ada3.1756064760.git.code@khaugsbakk.name","threadId":"64026","inReplyTo":null,"subject":"[PATCH] doc: config: replace backtick with apostrophe for possessive","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2025-08-24T19:46:51Z","receivedAt":"2025-08-24T19:47:15Z","isPatch":true,"sender":{"key":"kristofferhaugsbakk@fastmail.com","avatar":null},"body":"From: Kristoffer Haugsbakk \n\nRevert back to “Git's” which was used before d30c5cc4592 (doc: convert\ngit-mergetool options to new synopsis style, 2025-05-25) accidentally\nchanged it.\n\nSigned-off-by: Kristoffer Haugsbakk \n---\n\nNotes (series):\n I didn’t find any other occurrences.\n \n Demo with this commit merged into ‘master’:\n \n $ git grep -e '`s\\b' -e '`re\\b'\n Documentation/MyFirstObjectWalk.adoc:block under the `#include`s in `revision.h`. The most likely ones to be set in\n Documentation/ReviewingGuidelines.adoc:cooking\" emails & replies can be found using the query `s:\"What's cooking\"` on\n Documentation/ReviewingGuidelines.adoc:like `s:\"PATCH\" -s:\"Re:\"`. You can browse these results for topics relevant to\n Documentation/git-add.adoc:You also could say `s` or `sta` or `status` above as long as the\n Documentation/git-mailinfo.adoc:*\tLeading `Re:`, `re:`, and `:`.\n add-interactive.c: * It is implemented in the form of a pair of `string_list`s, the first one\n add-patch.c:\t\t\t * appended to the strbuf `s->plain`.\n add-patch.c:\t\t\t\t * `s->buf` still contains the part of the\n compat/regex/regexec.c:\tstring `s' and transit to `b':\n reftable/record.h:/* Advance `s.buf` by `n`, and decrease length. */\n t/t0013/shattered-1.pdf matches\n t/t0040-parse-options.sh:\terror: switch `s'\\'' requires a value\n t/t1092-sparse-checkout-compatibility.sh:\t# The following `git reset`s result in updating the index on files with\n \n On ‘master’:\n \n $ git grep -e '`s\\b' -e '`re\\b'\n Documentation/MyFirstObjectWalk.adoc:block under the `#include`s in `revision.h`. The most likely ones to be set in\n Documentation/ReviewingGuidelines.adoc:cooking\" emails & replies can be found using the query `s:\"What's cooking\"` on\n Documentation/ReviewingGuidelines.adoc:like `s:\"PATCH\" -s:\"Re:\"`. You can browse these results for topics relevant to\n Documentation/config/mergetool.adoc:\tare the versions of the file from before Git`s conflict\n Documentation/git-add.adoc:You also could say `s` or `sta` or `status` above as long as the\n Documentation/git-mailinfo.adoc:*\tLeading `Re:`, `re:`, and `:`.\n add-interactive.c: * It is implemented in the form of a pair of `string_list`s, the first one\n add-patch.c:\t\t\t * appended to the strbuf `s->plain`.\n add-patch.c:\t\t\t\t * `s->buf` still contains the part of the\n compat/regex/regexec.c:\tstring `s' and transit to `b':\n reftable/record.h:/* Advance `s.buf` by `n`, and decrease length. */\n Binary file t/t0013/shattered-1.pdf matches\n t/t0040-parse-options.sh:\terror: switch `s'\\'' requires a value\n t/t1092-sparse-checkout-compatibility.sh:\t# The following `git reset`s result in updating the index on files with\n\n Documentation/config/mergetool.adoc | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/mergetool.adoc b/Documentation/config/mergetool.adoc\nindex 6be506145c1..7064f5a462c 100644\n--- a/Documentation/config/mergetool.adoc\n+++ b/Documentation/config/mergetool.adoc\n@@ -65,7 +65,7 @@ endif::[]\n \tDuring a merge, Git will automatically resolve as many conflicts as\n \tpossible and write the `$MERGED` file containing conflict markers around\n \tany conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally\n-\tare the versions of the file from before Git`s conflict\n+\tare the versions of the file from before Git's conflict\n \tresolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so\n \tthat only the unresolved conflicts are presented to the merge tool. Can\n \tbe configured per-tool via the `mergetool..hideResolved`\n\nbase-commit: b983aaabc8b8cf406686f23689dda7e226f67e44\n-- \n2.51.0.103.g04b6f1b0792\n\n"},{"id":"524890","messageId":"xmqqwm6rp2y4.fsf@gitster.g","threadId":"64026","inReplyTo":"3ec6a00e3046166c7adb593f38c4099921d8ada3.1756064760.git.code@khaugsbakk.name","subject":"Re: [PATCH] doc: config: replace backtick with apostrophe for possessive","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-08-25T20:21:39Z","receivedAt":"2025-08-25T20:21:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"kristofferhaugsbakk@fastmail.com writes:\n\n> From: Kristoffer Haugsbakk \n>\n> Revert back to “Git's” which was used before d30c5cc4592 (doc: convert\n> git-mergetool options to new synopsis style, 2025-05-25) accidentally\n> changed it.\n>\n> Signed-off-by: Kristoffer Haugsbakk \n> ---\n> diff --git a/Documentation/config/mergetool.adoc b/Documentation/config/mergetool.adoc\n> index 6be506145c1..7064f5a462c 100644\n> --- a/Documentation/config/mergetool.adoc\n> +++ b/Documentation/config/mergetool.adoc\n> @@ -65,7 +65,7 @@ endif::[]\n> \tDuring a merge, Git will automatically resolve as many conflicts as\n> \tpossible and write the `$MERGED` file containing conflict markers around\n> \tany conflicts that it cannot resolve; `$LOCAL` and `$REMOTE` normally\n> -\tare the versions of the file from before Git`s conflict\n> +\tare the versions of the file from before Git's conflict\n> \tresolution. This flag causes `$LOCAL` and `$REMOTE` to be overwritten so\n> \tthat only the unresolved conflicts are presented to the merge tool. Can\n> \tbe configured per-tool via the `mergetool..hideResolved`\n\nObviously correct. Thanks.\n"}]}