Skip to content

Commit cb6462f

Browse files
committed
Merge branch 'en/doc-typoes'
Docfix. * en/doc-typoes: Documentation: normalize spelling of 'normalised' Documentation: fix several one-character-off spelling errors
2 parents f9bcd75 + 8523b1e commit cb6462f

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

Documentation/diff-options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ the normal order.
568568
--
569569
+
570570
Patterns have the same syntax and semantics as patterns used for
571-
fnmantch(3) without the FNM_PATHNAME flag, except a pathname also
571+
fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
572572
matches a pattern if removing any number of the final pathname
573573
components matches the pattern. For example, the pattern "`foo*bar`"
574574
matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
@@ -592,7 +592,7 @@ endif::git-format-patch[]
592592
Treat all files as text.
593593

594594
--ignore-cr-at-eol::
595-
Ignore carrige-return at the end of line when doing a comparison.
595+
Ignore carriage-return at the end of line when doing a comparison.
596596

597597
--ignore-space-at-eol::
598598
Ignore changes in whitespace at EOL.

Documentation/git-fetch-pack.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ be in a separate packet, and the list must end with a flush packet.
8888
infinite even if there is an ancestor-chain that long.
8989

9090
--shallow-since=<date>::
91-
Deepen or shorten the history of a shallow'repository to
91+
Deepen or shorten the history of a shallow repository to
9292
include all reachable commits after <date>.
9393

9494
--shallow-exclude=<revision>::

Documentation/git-for-each-ref.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ refname::
121121
stripping with positive <N>, or it becomes the full refname if
122122
stripping with negative <N>. Neither is an error.
123123
+
124-
`strip` can be used as a synomym to `lstrip`.
124+
`strip` can be used as a synonym to `lstrip`.
125125

126126
objecttype::
127127
The type of the object (`blob`, `tree`, `commit`, `tag`).

Documentation/git-mktree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SYNOPSIS
1414
DESCRIPTION
1515
-----------
1616
Reads standard input in non-recursive `ls-tree` output format, and creates
17-
a tree object. The order of the tree entries is normalised by mktree so
17+
a tree object. The order of the tree entries is normalized by mktree so
1818
pre-sorting the input is not required. The object name of the tree object
1919
built is written to the standard output.
2020

Documentation/git-send-email.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ must be used for each option.
255255

256256
--batch-size=<num>::
257257
Some email servers (e.g. smtp.163.com) limit the number emails to be
258-
sent per session (connection) and this will lead to a faliure when
258+
sent per session (connection) and this will lead to a failure when
259259
sending many messages. With this option, send-email will disconnect after
260260
sending $<num> messages and wait for a few seconds (see --relogin-delay)
261261
and reconnect, to work around such a limit. You may want to

Documentation/git-status.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ The possible options are:
113113
- 'matching' - Shows ignored files and directories matching an
114114
ignore pattern.
115115
+
116-
When 'matching' mode is specified, paths that explicity match an
116+
When 'matching' mode is specified, paths that explicitly match an
117117
ignored pattern are shown. If a directory matches an ignore pattern,
118118
then it is shown, but not paths contained in the ignored directory. If
119119
a directory does not match an ignore pattern, but all contents are

Documentation/technical/api-directory-listing.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ The notable options are:
5353
not be returned even if all of its contents are ignored. In
5454
this case, the contents are returned as individual entries.
5555
+
56-
If this is set, files and directories that explicity match an ignore
56+
If this is set, files and directories that explicitly match an ignore
5757
pattern are reported. Implicity ignored directories (directories that
5858
do not match an ignore pattern, but whose contents are all ignored)
5959
are not reported, instead all of the contents are reported.

0 commit comments

Comments
 (0)