{"thread":{"id":"65753","subject":"[PATCH] docs: fix typos","startedAt":"2026-06-04T13:15:43Z","lastAt":"2026-06-09T06:34:25Z","messageCount":6,"participants":["Tuomas Ahola","Kristoffer Haugsbakk","Weijie Yuan","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"544744","messageId":"20260604131457.19215-1-taahol@utu.fi","threadId":"65753","inReplyTo":null,"subject":"[PATCH] docs: fix typos","fromName":"Tuomas Ahola","fromEmail":"taahol@utu.fi","sentAt":"2026-06-04T13:14:57Z","receivedAt":"2026-06-04T13:15:43Z","isPatch":true,"body":"Fix some typos and grammar errors in comments and documentation files.\n\nSigned-off-by: Tuomas Ahola <taahol@utu.fi>\n---\n\nNotes:\n    Written mostly as an exercise on how to submit patches that depend\n    on other topics.\n    \n    $ git log --oneline --first-parent v2.54.0..\n    d19e9182ab (HEAD -> ta/typofixes) docs: fix typos\n    5a7e9cc03d Merge branch 'ta/approxidate-noon-fix'\n    f03649d802 Merge branch 'kh/name-rev-custom-format'\n    023a226b4b Merge branch 'jc/neuter-sideband-fixup'\n    \n    As can be seen, these topics have already graduated to master:\n    \n    $ git cherry master\n    + d19e9182ab097a722e32d459a9a58c8985831e3b\n\n Documentation/config/sideband.adoc | 2 +-\n Documentation/git-format-rev.adoc  | 2 +-\n date.c                             | 2 +-\n replay.h                           | 2 +-\n t/t9902-completion.sh              | 2 +-\n 5 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc\nindex 96fade7f5f..ff007aeb73 100644\n--- a/Documentation/config/sideband.adoc\n+++ b/Documentation/config/sideband.adoc\n@@ -13,7 +13,7 @@ sideband.allowControlCharacters::\n \t\tAllow control sequences that move the cursor. This is\n \t\tdisabled by default.\n \t`erase`::\n-\t\tAllow control sequences that erase charactrs. This is\n+\t\tAllow control sequences that erase characters. This is\n \t\tdisabled by default.\n \t`false`::\n \t\tMask all control characters other than line feeds and\ndiff --git a/Documentation/git-format-rev.adoc b/Documentation/git-format-rev.adoc\nindex c40d52e9f6..505a52fecc 100644\n--- a/Documentation/git-format-rev.adoc\n+++ b/Documentation/git-format-rev.adoc\n@@ -33,7 +33,7 @@ OPTIONS\n The argument `rev` is also accepted.\n \n `text`;; Formats all commit object names found in freeform text. These\n-\tmust the full object names, i.e. abbreviated hexidecimal object\n+\tmust be full object names, i.e. abbreviated hexadecimal object\n \tnames will not be interpreted.\n +\n Anything that is parsed as an object name but that is not found to be a\ndiff --git a/date.c b/date.c\nindex 05b78d852f..014065b419 100644\n--- a/date.c\n+++ b/date.c\n@@ -1074,7 +1074,7 @@ void datestamp(struct strbuf *out)\n  *\n  * The tm->tm_mday field has an additional logic of using negative values\n  * for date adjustments: -2 means yesterday and -3 the day before that,\n- * and so on.  The idea is to deref such adjustments until we are sure\n+ * and so on.  The idea is to defer such adjustments until we are sure\n  * there's no explicit mday specification in the approxidate string.\n  */\n static time_t update_tm(struct tm *tm, struct tm *now, time_t sec)\ndiff --git a/replay.h b/replay.h\nindex 0ab74b9805..90ed299ff0 100644\n--- a/replay.h\n+++ b/replay.h\n@@ -19,7 +19,7 @@ struct replay_revisions_options {\n \n \t/*\n \t * Starting point at which to create the new commits; must be a\n-\t * committish. References pointing at decendants of `onto` will be\n+\t * committish. References pointing at descendants of `onto` will be\n \t * updated to point to the new commits.\n \t */\n \tconst char *onto;\ndiff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\nindex 2f9a597ec7..7c6db76c9d 100755\n--- a/t/t9902-completion.sh\n+++ b/t/t9902-completion.sh\n@@ -2446,7 +2446,7 @@ test_expect_success FUNNYNAMES \\\n \t>repeated-quoted/2-file &&\n \t>repeated-quoted/3\\\"file &&   # ... and here, too.\n \n-\t# Still, we shold only list the directory name only once.\n+\t# Still, we should list the directory name only once.\n \ttest_path_completion repeated repeated-quoted\n '\n \n\nbase-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0\nprerequisite-patch-id: f827362e061e199150f149dd36c67664c77406bc\nprerequisite-patch-id: e5b32f0b916ec86eab6631b9bd9bafd639191765\nprerequisite-patch-id: 567a1832a220b2dbf095796cc8093b526d6a076c\nprerequisite-patch-id: aafa4bd4ceb7836a92d28d4c89b57032f74332e9\nprerequisite-patch-id: 2e073762fc9dceafcc6f16711bba425384a24305\nprerequisite-patch-id: 0aa605f0acdb71aa2eb173fdf3c57713c9561fe2\nprerequisite-patch-id: 5163040262c89eed4bcb04228b445d76497c9d58\nprerequisite-patch-id: c06c0461bf75ed638214ce98a54bba6578941c10\nprerequisite-patch-id: 571fdf3570f30fd41f6d681e99acc37df94d09a3\nprerequisite-patch-id: 54e7102e880d24a6b2d22bef9aa90a3078086d4d\nprerequisite-patch-id: d829fff1fcc8b6d086fcb6a40c62f835226ae32f\nprerequisite-patch-id: d1d8e2f2e274565e1d7437aa5ccfe44c3f3d8355\nprerequisite-patch-id: c79ebac6894b9a206f5699e9811e0348e111753d\nprerequisite-patch-id: a7750d7d2ec637d906f975f27ba3d03b33a4a34f\nprerequisite-patch-id: 083f554bc5e09ae54c6b545628196e11a9e90cea\n-- \n2.30.2\n\n"},{"id":"544747","messageId":"92fe3db2-83bd-4aa9-a1f4-bec01dfaf8ca@app.fastmail.com","threadId":"65753","inReplyTo":"20260604131457.19215-1-taahol@utu.fi","subject":"Re: [PATCH] docs: fix typos","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-06-04T14:45:35Z","receivedAt":"2026-06-04T14:45:57Z","isPatch":true,"body":"On Thu, Jun 4, 2026, at 15:14, Tuomas Ahola wrote:\n> [PATCH] docs: fix typos\n\nThe area `docs` isn’t correct since you are also changing comments in\nsource files.\n\n`*` could be used (as in a wildcard). Other people have used other\nthings for “treewide” changes.\n\n> Fix some typos and grammar errors in comments and documentation files.\n>\n> Signed-off-by: Tuomas Ahola <taahol@utu.fi>\n> ---\n>\n> Notes:\n>     Written mostly as an exercise on how to submit patches that depend\n>     on other topics.\n>\n>     $ git log --oneline --first-parent v2.54.0..\n>     d19e9182ab (HEAD -> ta/typofixes) docs: fix typos\n>     5a7e9cc03d Merge branch 'ta/approxidate-noon-fix'\n>     f03649d802 Merge branch 'kh/name-rev-custom-format'\n>     023a226b4b Merge branch 'jc/neuter-sideband-fixup'\n>\n>     As can be seen, these topics have already graduated to master:\n>\n>     $ git cherry master\n>     + d19e9182ab097a722e32d459a9a58c8985831e3b\n\nOkay, so you ran this from your branch and git-cherry(1) only found one\nnon-merge commit that was not already in `master`. Makes sense.\n\n>\n>  Documentation/config/sideband.adoc | 2 +-\n>  Documentation/git-format-rev.adoc  | 2 +-\n>  date.c                             | 2 +-\n>  replay.h                           | 2 +-\n>  t/t9902-completion.sh              | 2 +-\n>  5 files changed, 5 insertions(+), 5 deletions(-)\n>\n> diff --git a/Documentation/config/sideband.adoc\n> b/Documentation/config/sideband.adoc\n> index 96fade7f5f..ff007aeb73 100644\n> --- a/Documentation/config/sideband.adoc\n> +++ b/Documentation/config/sideband.adoc\n> @@ -13,7 +13,7 @@ sideband.allowControlCharacters::\n>  \t\tAllow control sequences that move the cursor. This is\n>  \t\tdisabled by default.\n>  \t`erase`::\n> -\t\tAllow control sequences that erase charactrs. This is\n> +\t\tAllow control sequences that erase characters. This is\n\nCorrection is correct.\n\n>  \t\tdisabled by default.\n>  \t`false`::\n>  \t\tMask all control characters other than line feeds and\n> diff --git a/Documentation/git-format-rev.adoc\n> b/Documentation/git-format-rev.adoc\n> index c40d52e9f6..505a52fecc 100644\n> --- a/Documentation/git-format-rev.adoc\n> +++ b/Documentation/git-format-rev.adoc\n> @@ -33,7 +33,7 @@ OPTIONS\n>  The argument `rev` is also accepted.\n>\n>  `text`;; Formats all commit object names found in freeform text. These\n> -\tmust the full object names, i.e. abbreviated hexidecimal object\n> +\tmust be full object names, i.e. abbreviated hexadecimal object\n\nCorrect. It should have been “hexadecimal”.\n\nThis also corrects a bewildering “the” where “be” should have been.\n\n>  \tnames will not be interpreted.\n>  +\n>  Anything that is parsed as an object name but that is not found to be a\n> diff --git a/date.c b/date.c\n> index 05b78d852f..014065b419 100644\n> --- a/date.c\n> +++ b/date.c\n> @@ -1074,7 +1074,7 @@ void datestamp(struct strbuf *out)\n>   *\n>   * The tm->tm_mday field has an additional logic of using negative values\n>   * for date adjustments: -2 means yesterday and -3 the day before that,\n> - * and so on.  The idea is to deref such adjustments until we are sure\n> + * and so on.  The idea is to defer such adjustments until we are sure\n\n“deref” could have been “dereference” but this must indeed mean\n“defer”. We are putting off a decision until later.\n\n>   * there's no explicit mday specification in the approxidate string.\n>   */\n>  static time_t update_tm(struct tm *tm, struct tm *now, time_t sec)\n> diff --git a/replay.h b/replay.h\n> index 0ab74b9805..90ed299ff0 100644\n> --- a/replay.h\n> +++ b/replay.h\n> @@ -19,7 +19,7 @@ struct replay_revisions_options {\n>\n>  \t/*\n>  \t * Starting point at which to create the new commits; must be a\n> -\t * committish. References pointing at decendants of `onto` will be\n> +\t * committish. References pointing at descendants of `onto` will be\n\nCorrect.\n\n>  \t * updated to point to the new commits.\n>  \t */\n>  \tconst char *onto;\n> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh\n> index 2f9a597ec7..7c6db76c9d 100755\n> --- a/t/t9902-completion.sh\n> +++ b/t/t9902-completion.sh\n> @@ -2446,7 +2446,7 @@ test_expect_success FUNNYNAMES \\\n>  \t>repeated-quoted/2-file &&\n>  \t>repeated-quoted/3\\\"file &&   # ... and here, too.\n>\n> -\t# Still, we shold only list the directory name only once.\n> +\t# Still, we should list the directory name only once.\n\nCorrect, that’s a “shold” typo.\n\nSecond time looking it over I see that you also drop the doubled “only”.\n\n>  \ttest_path_completion repeated repeated-quoted\n>  '\n>\n>\n> base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0\n> prerequisite-patch-id: f827362e061e199150f149dd36c67664c77406bc\n> prerequisite-patch-id: e5b32f0b916ec86eab6631b9bd9bafd639191765\n> prerequisite-patch-id: 567a1832a220b2dbf095796cc8093b526d6a076c\n> prerequisite-patch-id: aafa4bd4ceb7836a92d28d4c89b57032f74332e9\n> prerequisite-patch-id: 2e073762fc9dceafcc6f16711bba425384a24305\n> prerequisite-patch-id: 0aa605f0acdb71aa2eb173fdf3c57713c9561fe2\n> prerequisite-patch-id: 5163040262c89eed4bcb04228b445d76497c9d58\n> prerequisite-patch-id: c06c0461bf75ed638214ce98a54bba6578941c10\n> prerequisite-patch-id: 571fdf3570f30fd41f6d681e99acc37df94d09a3\n> prerequisite-patch-id: 54e7102e880d24a6b2d22bef9aa90a3078086d4d\n> prerequisite-patch-id: d829fff1fcc8b6d086fcb6a40c62f835226ae32f\n> prerequisite-patch-id: d1d8e2f2e274565e1d7437aa5ccfe44c3f3d8355\n> prerequisite-patch-id: c79ebac6894b9a206f5699e9811e0348e111753d\n> prerequisite-patch-id: a7750d7d2ec637d906f975f27ba3d03b33a4a34f\n> prerequisite-patch-id: 083f554bc5e09ae54c6b545628196e11a9e90cea\n\nOkay, these must be all the non-merge commits from the topics you\nmerged in.\n\n> --\n> 2.30.2\n"},{"id":"544753","messageId":"20260604165557.MWQuu%taahol@utu.fi","threadId":"65753","inReplyTo":"92fe3db2-83bd-4aa9-a1f4-bec01dfaf8ca@app.fastmail.com","subject":"Re: [PATCH] docs: fix typos","fromName":"Tuomas Ahola","fromEmail":"taahol@utu.fi","sentAt":"2026-06-04T16:55:57Z","receivedAt":"2026-06-04T16:56:03Z","isPatch":true,"body":"\"Kristoffer Haugsbakk\" <kristofferhaugsbakk@fastmail.com> wrote:\n\n> On Thu, Jun 4, 2026, at 15:14, Tuomas Ahola wrote:\n> > [PATCH] docs: fix typos\n> \n> The area `docs` isn’t correct since you are also changing comments in\n> source files.\n> \n> `*` could be used (as in a wildcard). Other people have used other\n> things for “treewide” changes.\n> \n\nHmm, I took that from the other typofix patches we have currently in `seen`.\n\n> >   * The tm->tm_mday field has an additional logic of using negative values\n> >   * for date adjustments: -2 means yesterday and -3 the day before that,\n> > - * and so on.  The idea is to deref such adjustments until we are sure\n> > + * and so on.  The idea is to defer such adjustments until we are sure\n> \n> “deref” could have been “dereference” but this must indeed mean\n> “defer”. We are putting off a decision until later.\n> \n\nYes, that was my own typo.  I always meant \"defer\".\n\n> >\n> > base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0\n> > prerequisite-patch-id: f827362e061e199150f149dd36c67664c77406bc\n> > prerequisite-patch-id: e5b32f0b916ec86eab6631b9bd9bafd639191765\n> >   [...]\n> > prerequisite-patch-id: 083f554bc5e09ae54c6b545628196e11a9e90cea\n> \n> Okay, these must be all the non-merge commits from the topics you\n> merged in.\n> \n\nThat's true.  Quite a list though.\n\nThanks for review!\n"},{"id":"544812","messageId":"aiMT-U9YhMNzXEkB@wyuan.org","threadId":"65753","inReplyTo":"20260604165557.MWQuu%taahol@utu.fi","subject":"Re: [PATCH] docs: fix typos","fromName":"Weijie Yuan","fromEmail":"wy@wyuan.org","sentAt":"2026-06-05T18:26:08Z","receivedAt":"2026-06-05T18:26:28Z","isPatch":true,"body":"On Thu, Jun 04, 2026 at 07:55:57PM +0300, Tuomas Ahola wrote:\n> \"Kristoffer Haugsbakk\" <kristofferhaugsbakk@fastmail.com> wrote:\n> \n> > On Thu, Jun 4, 2026, at 15:14, Tuomas Ahola wrote:\n> > > [PATCH] docs: fix typos\n> > \n> > The area `docs` isn´t correct since you are also changing comments in\n> > source files.\n> > \n> > `*` could be used (as in a wildcard). Other people have used other\n> > things for \"treewide\" changes.\n> > \n> \n> Hmm, I took that from the other typofix patches we have currently in `seen`.\n\nHi all,\n\nYup, my patch 8570d9ba31 (Merge branch 'wy/docs-typofixes' into seen, 2026-06-04)\nused \"docs\" as the scope of the commit message.\n\nI thought for a while what would be the preferred scope for a typofixes\ncommit that touches a quite wide range of the tree. And I didn't know we\ncould use \"*\".\n\nOn the one hand, I would rather let the typofix thing be simple and easy\nin one commit, since the actual changes were sort of logically unified.\nOn the other hand, splitting them apart makes it easier to name the\nscope of each commit, while it would make much \"meaningless\" noise. So I\nwas torn at that time.\n\n\"Luckily\", Junio didn't say something about that, and my topic is\nwaiting for more comments. So it just happens when I am struggling with\nre-roll it or not, I saw this thread. Therefore, could you please also\nraise it again in my topic in order to  give it a final decision? (Or\nstart a new thread as my patch is actually in Andrew's thread, really\nsorry Andrew)\n\nMessage-ID of my previous patch:\n<7b502e20e9495cd4720496bd6738a1fbeb453410.1780041658.git.wy@wyuan.org>\n\nThanks!\n"},{"id":"544969","messageId":"xmqqh5ncvfsu.fsf@gitster.g","threadId":"65753","inReplyTo":"20260604131457.19215-1-taahol@utu.fi","subject":"Re: [PATCH] docs: fix typos","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-06-08T22:16:33Z","receivedAt":"2026-06-08T22:16:35Z","isPatch":true,"body":"Tuomas Ahola <taahol@utu.fi> writes:\n\n> Fix some typos and grammar errors in comments and documentation files.\n>\n> Signed-off-by: Tuomas Ahola <taahol@utu.fi>\n> ---\n\nThanks, all changes make sense.  Will queue.\n\n"},{"id":"545015","messageId":"ef91b8fe-c794-4230-a298-43cebbf85e18@app.fastmail.com","threadId":"65753","inReplyTo":"20260604131457.19215-1-taahol@utu.fi","subject":"Re: [PATCH] docs: fix typos","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-06-09T06:34:03Z","receivedAt":"2026-06-09T06:34:25Z","isPatch":true,"body":"On Thu, Jun 4, 2026, at 15:14, Tuomas Ahola wrote:\n> Fix some typos and grammar errors in comments and documentation files.\n>\n> Signed-off-by: Tuomas Ahola <taahol@utu.fi>\n> ---\n>\n> Notes:\n>     Written mostly as an exercise on how to submit patches that depend\n>     on other topics.\n\nI’ve been thinking of how to handle typos for a few days now. ;) The\nfollowing does not apply to this submission since the maintainer said\nthat he will apply it.\n\nAnyway, it struck me that you might sometimes want to apply the typofix\non top of the original branch *if* the branch is scheduled to be merged\nto more than just `master`.\n\nSo e.g. this does *not* apply to topic kh/name-rev-custom-format since\nthat topic is not scheduled for a maintenance branch (`maint`). But:\n\n>\n>     $ git log --oneline --first-parent v2.54.0..\n>     d19e9182ab (HEAD -> ta/typofixes) docs: fix typos\n>     5a7e9cc03d Merge branch 'ta/approxidate-noon-fix'\n\nYour topic is. See `RelNotes`:\n\n    (merge b809304101 ta/approxidate-noon-fix later to maint).\n\nSo it might make sense in such cases to post a patch to\nbe applied on top of the topic.\n\nJust a thought for later.\n\n>     f03649d802 Merge branch 'kh/name-rev-custom-format'\n>     023a226b4b Merge branch 'jc/neuter-sideband-fixup'\n>\n>     As can be seen, these topics have already graduated to master:\n>\n>     $ git cherry master\n>     + d19e9182ab097a722e32d459a9a58c8985831e3b\n>[snip]\n"}]}