summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-04-05 17:20:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-09 05:15:02 (GMT)
commitc30d4f1b84458f61a3d02d396aae8409bf4a9be0 (patch)
tree8e6c8d29969ad31f22be69d5130e1917eeba4b68 /Documentation/diff-options.txt
parentd32eb83c1db7d0a8bb54fe743c6d1dd674d372c5 (diff)
downloadgit-c30d4f1b84458f61a3d02d396aae8409bf4a9be0.zip
git-c30d4f1b84458f61a3d02d396aae8409bf4a9be0.tar.gz
git-c30d4f1b84458f61a3d02d396aae8409bf4a9be0.tar.bz2
Documentation: fix several one-character-off spelling errors
Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 743af97..ee4046e 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -550,7 +550,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`".
@@ -574,7 +574,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.