undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rd/diff-options-typofix'

Browse Source 
Typofix.

* rd/diff-options-typofix:
  diff-options.txt: fix minor typos, font inconsistencies, in docs
This commit is contained in:
Junio C Hamano 2018-06-18 10:18:41 -07:00
commit d676cc512a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/diff-options.txt
View File

@ -64,7 +64,7 @@ ifndef::git-format-patch[]
endif::git-format-patch[] endif::git-format-patch[]
--indent-heuristic:: --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. easier to read. This is the default.
--no-indent-heuristic:: --no-indent-heuristic::
@ -106,7 +106,7 @@ diff" algorithm internally.
low-occurrence common elements". 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 non-default value and want to use the default one, then you
have to use `--diff-algorithm=default` option. have to use `--diff-algorithm=default` option.
@ -350,7 +350,7 @@ ifndef::git-format-patch[]
Warn if changes introduce conflict markers or whitespace errors. Warn if changes introduce conflict markers or whitespace errors.
What are considered whitespace errors is controlled by `core.whitespace` What are considered whitespace errors is controlled by `core.whitespace`
configuration. By default, trailing whitespaces (including 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 that is immediately followed by a tab character inside the
initial indent of the line are considered whitespace errors. initial indent of the line are considered whitespace errors.
Exits with non-zero status if problems are found. Not compatible Exits with non-zero status if problems are found. Not compatible
@ -364,7 +364,7 @@ ifndef::git-format-patch[]
this option is not given, and the configuration variable this option is not given, and the configuration variable
`diff.wsErrorHighlight` is not set, only whitespace errors in `diff.wsErrorHighlight` is not set, only whitespace errors in
`new` lines are highlighted. The whitespace errors are colored `new` lines are highlighted. The whitespace errors are colored
whith `color.diff.whitespace`. with `color.diff.whitespace`.
endif::git-format-patch[] endif::git-format-patch[]