diff-options.txt: fix minor typos, font inconsistencies, in docs
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Robert P. J. Day committed
Jun 11, 2018 at 09:56 UTC
7eedad15df615e1a2e34cb76920d5c60e9f8d8dd
1 file changed
+4
-4
Documentation/diff-options.txt
+4
-4
@@ -64,7 +64,7 @@ ifndef::git-format-patch[]
64
endif::git-format-patch[]
65
66
--indent-heuristic::
67
- Enable the heuristic that shift diff hunk boundaries to make patches
67
+ Enable the heuristic that shifts diff hunk boundaries to make patches
68
easier to read. This is the default.
69
70
--no-indent-heuristic::
@@ -96,7 +96,7 @@ endif::git-format-patch[]
96
low-occurrence common elements".
97
--
98
+
99
-For instance, if you configured diff.algorithm variable to a
99
+For instance, if you configured the `diff.algorithm` variable to a
100
non-default value and want to use the default one, then you
101
have to use `--diff-algorithm=default` option.
102
@@ -332,7 +332,7 @@ ifndef::git-format-patch[]
332
Warn if changes introduce conflict markers or whitespace errors.
333
What are considered whitespace errors is controlled by `core.whitespace`
334
configuration. By default, trailing whitespaces (including
335
- lines that solely consist of whitespaces) and a space character
335
+ lines that consist solely of whitespaces) and a space character
336
that is immediately followed by a tab character inside the
337
initial indent of the line are considered whitespace errors.
338
Exits with non-zero status if problems are found. Not compatible
@@ -346,7 +346,7 @@ ifndef::git-format-patch[]
346
this option is not given, and the configuration variable
347
`diff.wsErrorHighlight` is not set, only whitespace errors in
348
`new` lines are highlighted. The whitespace errors are colored
349
- whith `color.diff.whitespace`.
349
+ with `color.diff.whitespace`.
350
351
endif::git-format-patch[]
352