Merge branch 'ta/typofixes' into next

Typofixes

* ta/typofixes:
  docs: fix typos
This commit is contained in:
Junio C Hamano
2026-06-11 14:31:02 -07:00
5 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

@@ -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

2
date.c
View File

@@ -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)

View File

@@ -32,7 +32,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;

View File

@@ -2444,7 +2444,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
'