mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'en/doc-typoes'
Docfix. * en/doc-typoes: Documentation: normalize spelling of 'normalised' Documentation: fix several one-character-off spelling errors
This commit is contained in:
commit
cb6462fe74
|
@ -568,7 +568,7 @@ the normal order.
|
|||
--
|
||||
+
|
||||
Patterns have the same syntax and semantics as patterns used for
|
||||
fnmantch(3) without the FNM_PATHNAME flag, except a pathname also
|
||||
fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
|
||||
matches a pattern if removing any number of the final pathname
|
||||
components matches the pattern. For example, the pattern "`foo*bar`"
|
||||
matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
|
||||
|
@ -592,7 +592,7 @@ endif::git-format-patch[]
|
|||
Treat all files as text.
|
||||
|
||||
--ignore-cr-at-eol::
|
||||
Ignore carrige-return at the end of line when doing a comparison.
|
||||
Ignore carriage-return at the end of line when doing a comparison.
|
||||
|
||||
--ignore-space-at-eol::
|
||||
Ignore changes in whitespace at EOL.
|
||||
|
|
|
@ -88,7 +88,7 @@ be in a separate packet, and the list must end with a flush packet.
|
|||
infinite even if there is an ancestor-chain that long.
|
||||
|
||||
--shallow-since=<date>::
|
||||
Deepen or shorten the history of a shallow'repository to
|
||||
Deepen or shorten the history of a shallow repository to
|
||||
include all reachable commits after <date>.
|
||||
|
||||
--shallow-exclude=<revision>::
|
||||
|
|
|
@ -121,7 +121,7 @@ refname::
|
|||
stripping with positive <N>, or it becomes the full refname if
|
||||
stripping with negative <N>. Neither is an error.
|
||||
+
|
||||
`strip` can be used as a synomym to `lstrip`.
|
||||
`strip` can be used as a synonym to `lstrip`.
|
||||
|
||||
objecttype::
|
||||
The type of the object (`blob`, `tree`, `commit`, `tag`).
|
||||
|
|
|
@ -14,7 +14,7 @@ SYNOPSIS
|
|||
DESCRIPTION
|
||||
-----------
|
||||
Reads standard input in non-recursive `ls-tree` output format, and creates
|
||||
a tree object. The order of the tree entries is normalised by mktree so
|
||||
a tree object. The order of the tree entries is normalized by mktree so
|
||||
pre-sorting the input is not required. The object name of the tree object
|
||||
built is written to the standard output.
|
||||
|
||||
|
|
|
@ -255,7 +255,7 @@ must be used for each option.
|
|||
|
||||
--batch-size=<num>::
|
||||
Some email servers (e.g. smtp.163.com) limit the number emails to be
|
||||
sent per session (connection) and this will lead to a faliure when
|
||||
sent per session (connection) and this will lead to a failure when
|
||||
sending many messages. With this option, send-email will disconnect after
|
||||
sending $<num> messages and wait for a few seconds (see --relogin-delay)
|
||||
and reconnect, to work around such a limit. You may want to
|
||||
|
|
|
@ -113,7 +113,7 @@ The possible options are:
|
|||
- 'matching' - Shows ignored files and directories matching an
|
||||
ignore pattern.
|
||||
+
|
||||
When 'matching' mode is specified, paths that explicity match an
|
||||
When 'matching' mode is specified, paths that explicitly match an
|
||||
ignored pattern are shown. If a directory matches an ignore pattern,
|
||||
then it is shown, but not paths contained in the ignored directory. If
|
||||
a directory does not match an ignore pattern, but all contents are
|
||||
|
|
|
@ -53,7 +53,7 @@ The notable options are:
|
|||
not be returned even if all of its contents are ignored. In
|
||||
this case, the contents are returned as individual entries.
|
||||
+
|
||||
If this is set, files and directories that explicity match an ignore
|
||||
If this is set, files and directories that explicitly match an ignore
|
||||
pattern are reported. Implicity ignored directories (directories that
|
||||
do not match an ignore pattern, but whose contents are all ignored)
|
||||
are not reported, instead all of the contents are reported.
|
||||
|
|
Loading…
Reference in a new issue