summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-25 04:28:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-25 04:28:58 (GMT)
commitcb6462fe7435657fbd905018e9b3c76f1d946832 (patch)
treec30276158d62150933cba1c1d1d1d2543f941822 /Documentation/diff-options.txt
parentf9bcd751aaa8f9cb57bbe4f43f2c446f9aa523b3 (diff)
parent8523b1e355900e929ef1d362e6e4b4cffbbd9ffc (diff)
downloadgit-cb6462fe7435657fbd905018e9b3c76f1d946832.zip
git-cb6462fe7435657fbd905018e9b3c76f1d946832.tar.gz
git-cb6462fe7435657fbd905018e9b3c76f1d946832.tar.bz2
Merge branch 'en/doc-typoes'
Docfix. * en/doc-typoes: Documentation: normalize spelling of 'normalised' Documentation: fix several one-character-off spelling errors
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index e3a44f0..f466600 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -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.