diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 17:25:34 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 17:25:34 +0900 |
| commit | 96153bf70f5b69b8c480445c9aed3782ef6776a3 (patch) | |
| tree | e0081b96a5c6731fbb3f2bccce0be798a33c2201 /diff-options.txt | |
| parent | bbb584b1065a684f3ce95ab24b609bd800e6cae1 (diff) | |
| download | git-htmldocs-96153bf70f5b69b8c480445c9aed3782ef6776a3.tar.gz | |
Autogenerated HTML docs for v2.17.0-391-g1f1cd
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-options.txt b/diff-options.txt index e3a44f03c..f46660097 100644 --- a/diff-options.txt +++ b/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. |