* [PATCH] docs: fix typos
@ 2026-06-04 13:14 Tuomas Ahola
2026-06-04 14:45 ` Kristoffer Haugsbakk
0 siblings, 1 reply; 3+ messages in thread
From: Tuomas Ahola @ 2026-06-04 13:14 UTC (permalink / raw)
To: git; +Cc: Tuomas Ahola
Fix some typos and grammar errors in comments and documentation files.
Signed-off-by: Tuomas Ahola <taahol@utu•fi>
---
Notes:
Written mostly as an exercise on how to submit patches that depend
on other topics.
$ git log --oneline --first-parent v2.54.0..
d19e9182ab (HEAD -> ta/typofixes) docs: fix typos
5a7e9cc03d Merge branch 'ta/approxidate-noon-fix'
f03649d802 Merge branch 'kh/name-rev-custom-format'
023a226b4b Merge branch 'jc/neuter-sideband-fixup'
As can be seen, these topics have already graduated to master:
$ git cherry master
+ d19e9182ab097a722e32d459a9a58c8985831e3b
Documentation/config/sideband.adoc | 2 +-
Documentation/git-format-rev.adoc | 2 +-
date.c | 2 +-
replay.h | 2 +-
t/t9902-completion.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/config/sideband.adoc b/Documentation/config/sideband.adoc
index 96fade7f5f..ff007aeb73 100644
--- a/Documentation/config/sideband.adoc
+++ b/Documentation/config/sideband.adoc
@@ -13,7 +13,7 @@ sideband.allowControlCharacters::
Allow control sequences that move the cursor. This is
disabled by default.
`erase`::
- Allow control sequences that erase charactrs. This is
+ Allow control sequences that erase characters. This is
disabled by default.
`false`::
Mask all control characters other than line feeds and
diff --git a/Documentation/git-format-rev.adoc b/Documentation/git-format-rev.adoc
index c40d52e9f6..505a52fecc 100644
--- a/Documentation/git-format-rev.adoc
+++ b/Documentation/git-format-rev.adoc
@@ -33,7 +33,7 @@ OPTIONS
The argument `rev` is also accepted.
`text`;; Formats all commit object names found in freeform text. These
- must the full object names, i.e. abbreviated hexidecimal object
+ must be full object names, i.e. abbreviated hexadecimal object
names will not be interpreted.
+
Anything that is parsed as an object name but that is not found to be a
diff --git a/date.c b/date.c
index 05b78d852f..014065b419 100644
--- a/date.c
+++ b/date.c
@@ -1074,7 +1074,7 @@ void datestamp(struct strbuf *out)
*
* The tm->tm_mday field has an additional logic of using negative values
* for date adjustments: -2 means yesterday and -3 the day before that,
- * and so on. The idea is to deref such adjustments until we are sure
+ * and so on. The idea is to defer such adjustments until we are sure
* there's no explicit mday specification in the approxidate string.
*/
static time_t update_tm(struct tm *tm, struct tm *now, time_t sec)
diff --git a/replay.h b/replay.h
index 0ab74b9805..90ed299ff0 100644
--- a/replay.h
+++ b/replay.h
@@ -19,7 +19,7 @@ struct replay_revisions_options {
/*
* Starting point at which to create the new commits; must be a
- * committish. References pointing at decendants of `onto` will be
+ * committish. References pointing at descendants of `onto` will be
* updated to point to the new commits.
*/
const char *onto;
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 2f9a597ec7..7c6db76c9d 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -2446,7 +2446,7 @@ test_expect_success FUNNYNAMES \
>repeated-quoted/2-file &&
>repeated-quoted/3\"file && # ... and here, too.
- # Still, we shold only list the directory name only once.
+ # Still, we should list the directory name only once.
test_path_completion repeated repeated-quoted
'
base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0
prerequisite-patch-id: f827362e061e199150f149dd36c67664c77406bc
prerequisite-patch-id: e5b32f0b916ec86eab6631b9bd9bafd639191765
prerequisite-patch-id: 567a1832a220b2dbf095796cc8093b526d6a076c
prerequisite-patch-id: aafa4bd4ceb7836a92d28d4c89b57032f74332e9
prerequisite-patch-id: 2e073762fc9dceafcc6f16711bba425384a24305
prerequisite-patch-id: 0aa605f0acdb71aa2eb173fdf3c57713c9561fe2
prerequisite-patch-id: 5163040262c89eed4bcb04228b445d76497c9d58
prerequisite-patch-id: c06c0461bf75ed638214ce98a54bba6578941c10
prerequisite-patch-id: 571fdf3570f30fd41f6d681e99acc37df94d09a3
prerequisite-patch-id: 54e7102e880d24a6b2d22bef9aa90a3078086d4d
prerequisite-patch-id: d829fff1fcc8b6d086fcb6a40c62f835226ae32f
prerequisite-patch-id: d1d8e2f2e274565e1d7437aa5ccfe44c3f3d8355
prerequisite-patch-id: c79ebac6894b9a206f5699e9811e0348e111753d
prerequisite-patch-id: a7750d7d2ec637d906f975f27ba3d03b33a4a34f
prerequisite-patch-id: 083f554bc5e09ae54c6b545628196e11a9e90cea
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: fix typos
2026-06-04 13:14 [PATCH] docs: fix typos Tuomas Ahola
@ 2026-06-04 14:45 ` Kristoffer Haugsbakk
2026-06-04 16:55 ` Tuomas Ahola
0 siblings, 1 reply; 3+ messages in thread
From: Kristoffer Haugsbakk @ 2026-06-04 14:45 UTC (permalink / raw)
To: Tuomas Ahola, git
On Thu, Jun 4, 2026, at 15:14, Tuomas Ahola wrote:
> [PATCH] docs: fix typos
The area `docs` isn’t correct since you are also changing comments in
source files.
`*` could be used (as in a wildcard). Other people have used other
things for “treewide” changes.
> Fix some typos and grammar errors in comments and documentation files.
>
> Signed-off-by: Tuomas Ahola <taahol@utu•fi>
> ---
>
> Notes:
> Written mostly as an exercise on how to submit patches that depend
> on other topics.
>
> $ git log --oneline --first-parent v2.54.0..
> d19e9182ab (HEAD -> ta/typofixes) docs: fix typos
> 5a7e9cc03d Merge branch 'ta/approxidate-noon-fix'
> f03649d802 Merge branch 'kh/name-rev-custom-format'
> 023a226b4b Merge branch 'jc/neuter-sideband-fixup'
>
> As can be seen, these topics have already graduated to master:
>
> $ git cherry master
> + d19e9182ab097a722e32d459a9a58c8985831e3b
Okay, so you ran this from your branch and git-cherry(1) only found one
non-merge commit that was not already in `master`. Makes sense.
>
> Documentation/config/sideband.adoc | 2 +-
> Documentation/git-format-rev.adoc | 2 +-
> date.c | 2 +-
> replay.h | 2 +-
> t/t9902-completion.sh | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/config/sideband.adoc
> b/Documentation/config/sideband.adoc
> index 96fade7f5f..ff007aeb73 100644
> --- a/Documentation/config/sideband.adoc
> +++ b/Documentation/config/sideband.adoc
> @@ -13,7 +13,7 @@ sideband.allowControlCharacters::
> Allow control sequences that move the cursor. This is
> disabled by default.
> `erase`::
> - Allow control sequences that erase charactrs. This is
> + Allow control sequences that erase characters. This is
Correction is correct.
> disabled by default.
> `false`::
> Mask all control characters other than line feeds and
> diff --git a/Documentation/git-format-rev.adoc
> b/Documentation/git-format-rev.adoc
> index c40d52e9f6..505a52fecc 100644
> --- a/Documentation/git-format-rev.adoc
> +++ b/Documentation/git-format-rev.adoc
> @@ -33,7 +33,7 @@ OPTIONS
> The argument `rev` is also accepted.
>
> `text`;; Formats all commit object names found in freeform text. These
> - must the full object names, i.e. abbreviated hexidecimal object
> + must be full object names, i.e. abbreviated hexadecimal object
Correct. It should have been “hexadecimal”.
This also corrects a bewildering “the” where “be” should have been.
> names will not be interpreted.
> +
> Anything that is parsed as an object name but that is not found to be a
> diff --git a/date.c b/date.c
> index 05b78d852f..014065b419 100644
> --- a/date.c
> +++ b/date.c
> @@ -1074,7 +1074,7 @@ void datestamp(struct strbuf *out)
> *
> * The tm->tm_mday field has an additional logic of using negative values
> * for date adjustments: -2 means yesterday and -3 the day before that,
> - * and so on. The idea is to deref such adjustments until we are sure
> + * and so on. The idea is to defer such adjustments until we are sure
“deref” could have been “dereference” but this must indeed mean
“defer”. We are putting off a decision until later.
> * there's no explicit mday specification in the approxidate string.
> */
> static time_t update_tm(struct tm *tm, struct tm *now, time_t sec)
> diff --git a/replay.h b/replay.h
> index 0ab74b9805..90ed299ff0 100644
> --- a/replay.h
> +++ b/replay.h
> @@ -19,7 +19,7 @@ struct replay_revisions_options {
>
> /*
> * Starting point at which to create the new commits; must be a
> - * committish. References pointing at decendants of `onto` will be
> + * committish. References pointing at descendants of `onto` will be
Correct.
> * updated to point to the new commits.
> */
> const char *onto;
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 2f9a597ec7..7c6db76c9d 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -2446,7 +2446,7 @@ test_expect_success FUNNYNAMES \
> >repeated-quoted/2-file &&
> >repeated-quoted/3\"file && # ... and here, too.
>
> - # Still, we shold only list the directory name only once.
> + # Still, we should list the directory name only once.
Correct, that’s a “shold” typo.
Second time looking it over I see that you also drop the doubled “only”.
> test_path_completion repeated repeated-quoted
> '
>
>
> base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0
> prerequisite-patch-id: f827362e061e199150f149dd36c67664c77406bc
> prerequisite-patch-id: e5b32f0b916ec86eab6631b9bd9bafd639191765
> prerequisite-patch-id: 567a1832a220b2dbf095796cc8093b526d6a076c
> prerequisite-patch-id: aafa4bd4ceb7836a92d28d4c89b57032f74332e9
> prerequisite-patch-id: 2e073762fc9dceafcc6f16711bba425384a24305
> prerequisite-patch-id: 0aa605f0acdb71aa2eb173fdf3c57713c9561fe2
> prerequisite-patch-id: 5163040262c89eed4bcb04228b445d76497c9d58
> prerequisite-patch-id: c06c0461bf75ed638214ce98a54bba6578941c10
> prerequisite-patch-id: 571fdf3570f30fd41f6d681e99acc37df94d09a3
> prerequisite-patch-id: 54e7102e880d24a6b2d22bef9aa90a3078086d4d
> prerequisite-patch-id: d829fff1fcc8b6d086fcb6a40c62f835226ae32f
> prerequisite-patch-id: d1d8e2f2e274565e1d7437aa5ccfe44c3f3d8355
> prerequisite-patch-id: c79ebac6894b9a206f5699e9811e0348e111753d
> prerequisite-patch-id: a7750d7d2ec637d906f975f27ba3d03b33a4a34f
> prerequisite-patch-id: 083f554bc5e09ae54c6b545628196e11a9e90cea
Okay, these must be all the non-merge commits from the topics you
merged in.
> --
> 2.30.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] docs: fix typos
2026-06-04 14:45 ` Kristoffer Haugsbakk
@ 2026-06-04 16:55 ` Tuomas Ahola
0 siblings, 0 replies; 3+ messages in thread
From: Tuomas Ahola @ 2026-06-04 16:55 UTC (permalink / raw)
To: Kristoffer Haugsbakk; +Cc: git
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com> wrote:
> On Thu, Jun 4, 2026, at 15:14, Tuomas Ahola wrote:
> > [PATCH] docs: fix typos
>
> The area `docs` isn’t correct since you are also changing comments in
> source files.
>
> `*` could be used (as in a wildcard). Other people have used other
> things for “treewide” changes.
>
Hmm, I took that from the other typofix patches we have currently in `seen`.
> > * The tm->tm_mday field has an additional logic of using negative values
> > * for date adjustments: -2 means yesterday and -3 the day before that,
> > - * and so on. The idea is to deref such adjustments until we are sure
> > + * and so on. The idea is to defer such adjustments until we are sure
>
> “deref” could have been “dereference” but this must indeed mean
> “defer”. We are putting off a decision until later.
>
Yes, that was my own typo. I always meant "defer".
> >
> > base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0
> > prerequisite-patch-id: f827362e061e199150f149dd36c67664c77406bc
> > prerequisite-patch-id: e5b32f0b916ec86eab6631b9bd9bafd639191765
> > [...]
> > prerequisite-patch-id: 083f554bc5e09ae54c6b545628196e11a9e90cea
>
> Okay, these must be all the non-merge commits from the topics you
> merged in.
>
That's true. Quite a list though.
Thanks for review!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-06-04 16:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-04 13:14 [PATCH] docs: fix typos Tuomas Ahola
2026-06-04 14:45 ` Kristoffer Haugsbakk
2026-06-04 16:55 ` Tuomas Ahola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox