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 1851a07705..faf95c7459 100644 --- a/replay.h +++ b/replay.h @@ -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; diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 28f61f08fb..55dc9eabfc 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -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 '