mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
d33c87517a
commit
7eedad15df
|
@ -64,7 +64,7 @@ ifndef::git-format-patch[]
|
|||
endif::git-format-patch[]
|
||||
|
||||
--indent-heuristic::
|
||||
Enable the heuristic that shift diff hunk boundaries to make patches
|
||||
Enable the heuristic that shifts diff hunk boundaries to make patches
|
||||
easier to read. This is the default.
|
||||
|
||||
--no-indent-heuristic::
|
||||
|
@ -96,7 +96,7 @@ endif::git-format-patch[]
|
|||
low-occurrence common elements".
|
||||
--
|
||||
+
|
||||
For instance, if you configured diff.algorithm variable to a
|
||||
For instance, if you configured the `diff.algorithm` variable to a
|
||||
non-default value and want to use the default one, then you
|
||||
have to use `--diff-algorithm=default` option.
|
||||
|
||||
|
@ -332,7 +332,7 @@ ifndef::git-format-patch[]
|
|||
Warn if changes introduce conflict markers or whitespace errors.
|
||||
What are considered whitespace errors is controlled by `core.whitespace`
|
||||
configuration. By default, trailing whitespaces (including
|
||||
lines that solely consist of whitespaces) and a space character
|
||||
lines that consist solely of whitespaces) and a space character
|
||||
that is immediately followed by a tab character inside the
|
||||
initial indent of the line are considered whitespace errors.
|
||||
Exits with non-zero status if problems are found. Not compatible
|
||||
|
@ -346,7 +346,7 @@ ifndef::git-format-patch[]
|
|||
this option is not given, and the configuration variable
|
||||
`diff.wsErrorHighlight` is not set, only whitespace errors in
|
||||
`new` lines are highlighted. The whitespace errors are colored
|
||||
whith `color.diff.whitespace`.
|
||||
with `color.diff.whitespace`.
|
||||
|
||||
endif::git-format-patch[]
|
||||
|
||||
|
|
Loading…
Reference in a new issue