Skip to content

Commit d3096d2

Browse files
committed
Merge branch 'en/doc-typofix'
Docfix. * en/doc-typofix: Fix spelling errors in no-longer-updated-from-upstream modules multimail: fix a few simple spelling errors sha1dc: fix trivial comment spelling error Fix spelling errors in test commands Fix spelling errors in messages shown to users Fix spelling errors in names of tests Fix spelling errors in comments of testcases Fix spelling errors in code comments Fix spelling errors in documentation outside of Documentation/ Documentation: fix a bunch of typos, both old and new
2 parents 26f20fa + 03670c8 commit d3096d2

File tree

141 files changed

+214
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+214
-214
lines changed

Documentation/CodingGuidelines

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ For shell scripts specifically (not exhaustive):
7575

7676
- If you want to find out if a command is available on the user's
7777
$PATH, you should use 'type <command>', instead of 'which <command>'.
78-
The output of 'which' is not machine parseable and its exit code
78+
The output of 'which' is not machine parsable and its exit code
7979
is not reliable across platforms.
8080

8181
- We use POSIX compliant parameter substitutions and avoid bashisms;
@@ -203,7 +203,7 @@ For C programs:
203203
. since early 2012 with e1327023ea, we have been using an enum
204204
definition whose last element is followed by a comma. This, like
205205
an array initializer that ends with a trailing comma, can be used
206-
to reduce the patch noise when adding a new identifer at the end.
206+
to reduce the patch noise when adding a new identifier at the end.
207207

208208
. since mid 2017 with cbc0f81d, we have been using designated
209209
initializers for struct (e.g. "struct t v = { .val = 'a' };").

Documentation/RelNotes/1.5.0.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Updates in v1.5.0 since v1.4.4 series
251251
the repository when that happens.
252252

253253

254-
* Crufts removal
254+
* Cruft removal
255255

256256
- We used to say "old commits are retrievable using reflog and
257257
'master@{yesterday}' syntax as long as you haven't run
@@ -379,7 +379,7 @@ Updates in v1.5.0 since v1.4.4 series
379379
- The value of i18n.commitencoding in the originating
380380
repository is recorded in the commit object on the "encoding"
381381
header, if it is not UTF-8. git-log and friends notice this,
382-
and reencodes the message to the log output encoding when
382+
and re-encodes the message to the log output encoding when
383383
displaying, if they are different. The log output encoding
384384
is determined by "git log --encoding=<encoding>",
385385
i18n.logoutputencoding configuration, or i18n.commitencoding

Documentation/RelNotes/1.6.5.4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Fixes since v1.6.5.3
1010

1111
* "git prune-packed" gave progress output even when its standard error is
1212
not connected to a terminal; this caused cron jobs that run it to
13-
produce crufts.
13+
produce cruft.
1414

1515
* "git pack-objects --all-progress" is an option to ask progress output
1616
from write-object phase _if_ progress output were to be produced, and

Documentation/RelNotes/1.7.0.2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Fixes since v1.7.0.1
3434
* "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series
3535
to speed up scanning of large working tree.
3636

37-
* "gitweb" did not diagnose parsing errors properly while reading tis configuration
37+
* "gitweb" did not diagnose parsing errors properly while reading its configuration
3838
file.
3939

4040
And other minor fixes and documentation updates.

Documentation/RelNotes/1.7.10.4.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Fixes since v1.7.10.3
77
* The message file for Swedish translation has been updated a bit.
88

99
* A name taken from mailmap was copied into an internal buffer
10-
incorrectly and could overun the buffer if it is too long.
10+
incorrectly and could overrun the buffer if it is too long.
1111

1212
* A malformed commit object that has a header line chomped in the
1313
middle could kill git with a NULL pointer dereference.

Documentation/RelNotes/1.7.12.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Fixes since v1.7.12.2
2525
its Accept-Encoding header.
2626

2727
* "git receive-pack" (the counterpart to "git push") did not give
28-
progress output while processing objects it received to the puser
28+
progress output while processing objects it received to the user
2929
when run over the smart-http protocol.
3030

3131
* "git status" honored the ignore=dirty settings in .gitmodules but

Documentation/RelNotes/1.7.5.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Fixes since v1.7.5.2
2222
* "git log --stdin path" with an input that has additional pathspec
2323
used to corrupt memory.
2424

25-
* "git send-pack" (hence "git push") over smalt-HTTP protocol could
25+
* "git send-pack" (hence "git push") over smart-HTTP protocol could
2626
deadlock when the client side pack-object died early.
2727

2828
* Compressed tarball gitweb generates used to be made with the timestamp

Documentation/RelNotes/1.8.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ to them for details).
233233
together, misdetected branches.
234234

235235
* "git receive-pack" (the counterpart to "git push") did not give
236-
progress output while processing objects it received to the puser
236+
progress output while processing objects it received to the user
237237
when run over the smart-http protocol.
238238

239239
* When you misspell the command name you give to the "exec" action in

Documentation/RelNotes/1.8.4.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Fixes since v1.8.4
1515
in 1.8.4-rc1).
1616

1717
* "git rebase -i" and other scripted commands were feeding a
18-
random, data dependant error message to 'echo' and expecting it
18+
random, data dependent error message to 'echo' and expecting it
1919
to come out literally.
2020

2121
* Setting the "submodule.<name>.path" variable to the empty

Documentation/RelNotes/2.1.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Git v2.1.3 Release Notes
1313
they are new enough to support the `--output` option.
1414

1515
* "git pack-objects" forgot to disable the codepath to generate
16-
object recheability bitmap when it needs to split the resulting
16+
object reachability bitmap when it needs to split the resulting
1717
pack.
1818

1919
* "gitweb" used deprecated CGI::startfrom, which was removed from

Documentation/RelNotes/2.10.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ notes for details).
478478
* One part of "git am" had an oddball helper function that called
479479
stuff from outside "his" as opposed to calling what we have "ours",
480480
which was not gender-neutral and also inconsistent with the rest of
481-
the system where outside stuff is usuall called "theirs" in
481+
the system where outside stuff is usually called "theirs" in
482482
contrast to "ours".
483483

484484
* "git blame file" allowed the lineage of lines in the uncommitted,

Documentation/RelNotes/2.10.2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Fixes since v2.10.1
8686
by refusing to check out a branch that is already checked out in
8787
another worktree. However, this also prevented checking out a
8888
branch, which is designated as the primary branch of a bare
89-
reopsitory, in a worktree that is connected to the bare
89+
repository, in a worktree that is connected to the bare
9090
repository. The check has been corrected to allow it.
9191

9292
* "git rebase" immediately after "git clone" failed to find the fork

Documentation/RelNotes/2.11.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Fixes since v2.11
104104
"git difftool --dir-diff" from a subdirectory never worked. This
105105
has been fixed.
106106

107-
* "git p4" that tracks multile p4 paths imported a single changelist
107+
* "git p4" that tracks multiple p4 paths imported a single changelist
108108
that touches files in these multiple paths as one commit, followed
109109
by many empty commits. This has been fixed.
110110

Documentation/RelNotes/2.12.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ notes for details).
315315
"git difftool --dir-diff" from a subdirectory never worked. This
316316
has been fixed.
317317

318-
* "git p4" that tracks multile p4 paths imported a single changelist
318+
* "git p4" that tracks multiple p4 paths imported a single changelist
319319
that touches files in these multiple paths as one commit, followed
320320
by many empty commits. This has been fixed.
321321

Documentation/RelNotes/2.13.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ UI, Workflows & Features
177177
been changed to enable "--decorate".
178178

179179
* The output from "git status --short" has been extended to show
180-
various kinds of dirtyness in submodules differently; instead of to
180+
various kinds of dirtiness in submodules differently; instead of to
181181
"M" for modified, 'm' and '?' can be shown to signal changes only
182182
to the working tree of the submodule but not the commit that is
183183
checked out.

Documentation/RelNotes/2.13.3.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Fixes since v2.13.2
2525
* The code to pick up and execute command alias definition from the
2626
configuration used to switch to the top of the working tree and
2727
then come back when the expanded alias was executed, which was
28-
unnecessarilyl complex. Attempt to simplify the logic by using the
28+
unnecessarily complex. Attempt to simplify the logic by using the
2929
early-config mechanism that does not chdir around.
3030

3131
* "git add -p" were updated in 2.12 timeframe to cope with custom
@@ -35,7 +35,7 @@ Fixes since v2.13.2
3535
* Fix a recent regression to "git rebase -i" and add tests that would
3636
have caught it and others.
3737

38-
* An unaligned 32-bit access in pack-bitmap code ahs been corrected.
38+
* An unaligned 32-bit access in pack-bitmap code has been corrected.
3939

4040
* Tighten error checks for invalid "git apply" input.
4141

Documentation/RelNotes/2.14.0.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Performance, Internal Implementation, Development Support etc.
141141
* Some platforms have ulong that is smaller than time_t, and our
142142
historical use of ulong for timestamp would mean they cannot
143143
represent some timestamp that the platform allows. Invent a
144-
separate and dedicated timestamp_t (so that we can distingiuish
144+
separate and dedicated timestamp_t (so that we can distinguish
145145
timestamps and a vanilla ulongs, which along is already a good
146146
move), and then declare uintmax_t is the type to be used as the
147147
timestamp_t.
@@ -442,7 +442,7 @@ notes for details).
442442
* The code to pick up and execute command alias definition from the
443443
configuration used to switch to the top of the working tree and
444444
then come back when the expanded alias was executed, which was
445-
unnecessarilyl complex. Attempt to simplify the logic by using the
445+
unnecessarily complex. Attempt to simplify the logic by using the
446446
early-config mechanism that does not chdir around.
447447

448448
* Fix configuration codepath to pay proper attention to commondir

Documentation/RelNotes/2.16.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ Fixes since v2.15
407407
(merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint).
408408

409409
* Amending commits in git-gui broke the author name that is non-ascii
410-
due to incorrect enconding conversion.
410+
due to incorrect encoding conversion.
411411

412412
* Recent update to the submodule configuration code broke "diff-tree"
413413
by accidentally stopping to read from the index upfront.

Documentation/RelNotes/2.16.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Fixes since v2.16.2
2424

2525
* The http tracing code, often used to debug connection issues,
2626
learned to redact potentially sensitive information from its output
27-
so that it can be more safely sharable.
27+
so that it can be more safely shareable.
2828

2929
* Crash fix for a corner case where an error codepath tried to unlock
3030
what it did not acquire lock on.

Documentation/RelNotes/2.17.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Fixes since v2.16
216216

217217
* The http tracing code, often used to debug connection issues,
218218
learned to redact potentially sensitive information from its output
219-
so that it can be more safely sharable.
219+
so that it can be more safely shareable.
220220
(merge 8ba18e6fa4 jt/http-redact-cookies later to maint).
221221

222222
* Crash fix for a corner case where an error codepath tried to unlock

Documentation/RelNotes/2.18.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Performance, Internal Implementation, Development Support etc.
179179
(merge 00a3da2a13 nd/remove-ignore-env-field later to maint).
180180

181181
* Code to find the length to uniquely abbreviate object names based
182-
on packfile content, which is a relatively recent addtion, has been
182+
on packfile content, which is a relatively recent addition, has been
183183
optimized to use the same fan-out table.
184184

185185
* The mechanism to use parse-options API to automate the command line

Documentation/RelNotes/2.19.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
106106
* The conversion to pass "the_repository" and then "a_repository"
107107
throughout the object access API continues.
108108

109-
* Continuing with the idea to programatically enumerate various
109+
* Continuing with the idea to programmatically enumerate various
110110
pieces of data required for command line completion, teach the
111111
codebase to report the list of configuration variables
112112
subcommands care about to help complete them.

Documentation/RelNotes/2.20.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ UI, Workflows & Features
119119
alias expansion.
120120

121121
* The documentation of "git gc" has been updated to mention that it
122-
is no longer limited to "pruning away crufts" but also updates
122+
is no longer limited to "pruning away cruft" but also updates
123123
ancillary files like commit-graph as a part of repository
124124
optimization.
125125

Documentation/RelNotes/2.3.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Fixes since v2.3.2
1212
* Description given by "grep -h" for its --exclude-standard option
1313
was phrased poorly.
1414

15-
* Documentaton for "git remote add" mentioned "--tags" and
15+
* Documentation for "git remote add" mentioned "--tags" and
1616
"--no-tags" and it was not clear that fetch from the remote in
1717
the future will use the default behaviour when neither is given
1818
to override it.

Documentation/RelNotes/2.3.7.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Git v2.3.7 Release Notes
44
Fixes since v2.3.6
55
------------------
66

7-
* An earlier update to the parser that disects a URL broke an
7+
* An earlier update to the parser that dissects a URL broke an
88
address, followed by a colon, followed by an empty string (instead
99
of the port number), e.g. ssh://example.com:/path/to/repo.
1010

Documentation/RelNotes/2.4.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Fixes since v2.4.3
6666
* Some time ago, "git blame" (incorrectly) lost the convert_to_git()
6767
call when synthesizing a fake "tip" commit that represents the
6868
state in the working tree, which broke folks who record the history
69-
with LF line ending to make their project portabile across
69+
with LF line ending to make their project portable across
7070
platforms while terminating lines in their working tree files with
7171
CRLF for their platform.
7272

Documentation/RelNotes/2.7.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ UI, Workflows & Features
4040

4141
* "git interpret-trailers" can now run outside of a Git repository.
4242

43-
* "git p4" learned to reencode the pathname it uses to communicate
43+
* "git p4" learned to re-encode the pathname it uses to communicate
4444
with the p4 depot with a new option.
4545

4646
* Give progress meter to "git filter-branch".

Documentation/RelNotes/2.8.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Performance, Internal Implementation, Development Support etc.
189189
* Some calls to strcpy(3) triggers a false warning from static
190190
analyzers that are less intelligent than humans, and reducing the
191191
number of these false hits helps us notice real issues. A few
192-
calls to strcpy(3) in a couple of protrams that are already safe
192+
calls to strcpy(3) in a couple of programs that are already safe
193193
has been rewritten to avoid false warnings.
194194

195195
* The "name_path" API was an attempt to reduce the need to construct

Documentation/RelNotes/2.9.3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Fixes since v2.9.2
3636
* One part of "git am" had an oddball helper function that called
3737
stuff from outside "his" as opposed to calling what we have "ours",
3838
which was not gender-neutral and also inconsistent with the rest of
39-
the system where outside stuff is usuall called "theirs" in
39+
the system where outside stuff is usually called "theirs" in
4040
contrast to "ours".
4141

4242
* The test framework learned a new helper test_match_signal to

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ refer to linkgit:gitignore[5] for details. For convenience:
142142

143143
`gitdir/i`::
144144
This is the same as `gitdir` except that matching is done
145-
case-insensitively (e.g. on case-insensitive file sytems)
145+
case-insensitively (e.g. on case-insensitive file systems)
146146

147147
`onbranch`::
148148
The data that follows the keyword `onbranch:` is taken to be a

Documentation/config/tag.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tag.gpgSign::
1313
Use of this option when running in an automated script can
1414
result in a large number of tags being signed. It is therefore
1515
convenient to use an agent to avoid typing your gpg passphrase
16-
several times. Note that this option doesn't affects tag signing
16+
several times. Note that this option doesn't affect tag signing
1717
behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options.
1818

1919
tar.umask::

Documentation/git-bisect-lk2009.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Test suites are very nice. But when they are used alone, they are
158158
supposed to be used so that all the tests are checked after each
159159
commit. This means that they are not very efficient, because many
160160
tests are run for no interesting result, and they suffer from
161-
combinational explosion.
161+
combinatorial explosion.
162162

163163
In fact the problem is that big software often has many different
164164
configuration options and that each test case should pass for each

Documentation/git-check-attr.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ OPTIONS
3232
instead of from the command-line.
3333

3434
-z::
35-
The output format is modified to be machine-parseable.
35+
The output format is modified to be machine-parsable.
3636
If `--stdin` is also given, input paths are separated
3737
with a NUL character instead of a linefeed character.
3838

Documentation/git-check-ignore.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ OPTIONS
3939
instead of from the command-line.
4040

4141
-z::
42-
The output format is modified to be machine-parseable (see
42+
The output format is modified to be machine-parsable (see
4343
below). If `--stdin` is also given, input paths are separated
4444
with a NUL character instead of a linefeed character.
4545

Documentation/git-cvsserver.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ In `dbDriver` and `dbUser` you can use the following variables:
294294
Git directory name
295295
%g::
296296
Git directory name, where all characters except for
297-
alpha-numeric ones, `.`, and `-` are replaced with
297+
alphanumeric ones, `.`, and `-` are replaced with
298298
`_` (this should make it easier to use the directory
299299
name in a filename if wanted)
300300
%m::

Documentation/git-fast-export.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ by keeping the marks the same across runs.
142142
Specify how to handle `encoding` header in commit objects. When
143143
asking to 'abort' (which is the default), this program will die
144144
when encountering such a commit object. With 'yes', the commit
145-
message will be reencoded into UTF-8. With 'no', the original
145+
message will be re-encoded into UTF-8. With 'no', the original
146146
encoding will be preserved.
147147

148148
--refspec::

Documentation/git-filter-branch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ repo-filter' also provides
534534
https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely],
535535
a drop-in git-filter-branch replacement (with a few caveats). While
536536
filter-lamely suffers from all the same safety issues as
537-
git-filter-branch, it at least ameloriates the performance issues a
537+
git-filter-branch, it at least ameliorates the performance issues a
538538
little.
539539

540540
[[SAFETY]]

Documentation/git-range-diff.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ corresponding.
242242

243243
The overall time needed to compute this algorithm is the time needed to
244244
compute n+m commit diffs and then n*m diffs of patches, plus the time
245-
needed to compute the least-cost assigment between n and m diffs. Git
245+
needed to compute the least-cost assignment between n and m diffs. Git
246246
uses an implementation of the Jonker-Volgenant algorithm to solve the
247247
assignment problem, which has cubic runtime complexity. The matching
248248
found in this case will look like this:

Documentation/git-tag.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ OPTIONS
6565
--sign::
6666
Make a GPG-signed tag, using the default e-mail address's key.
6767
The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
68-
configuration variable if it exists, or disabled oder otherwise.
68+
configuration variable if it exists, or disabled otherwise.
6969
See linkgit:git-config[1].
7070

7171
--no-sign::

Documentation/git-update-index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ specified by the splitIndex.sharedIndexExpire config variable (see
432432
linkgit:git-config[1]).
433433

434434
To avoid deleting a shared index file that is still used, its
435-
modification time is updated to the current time everytime a new split
435+
modification time is updated to the current time every time a new split
436436
index based on the shared index file is either created or read from.
437437

438438
UNTRACKED CACHE

0 commit comments

Comments
 (0)