mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
Merge branch 'ah/doc-wserrorhighlight'
Doc update. * ah/doc-wserrorhighlight: doc: add missing values "none" and "default" for diff.wsErrorHighlight
This commit is contained in:
commit
4c244c25f0
|
@ -200,7 +200,10 @@ diff.algorithm::
|
||||||
+
|
+
|
||||||
|
|
||||||
diff.wsErrorHighlight::
|
diff.wsErrorHighlight::
|
||||||
A comma separated list of `old`, `new`, `context`, that
|
Highlight whitespace errors in the `context`, `old` or `new`
|
||||||
specifies how whitespace errors on lines are highlighted
|
lines of the diff. Multiple values are separated by comma,
|
||||||
with `color.diff.whitespace`. Can be overridden by the
|
`none` resets previous values, `default` reset the list to
|
||||||
command line option `--ws-error-highlight=<kind>`
|
`new` and `all` is a shorthand for `old,new,context`. The
|
||||||
|
whitespace errors are colored with `color.diff.whitespace`.
|
||||||
|
The command line option `--ws-error-highlight=<kind>`
|
||||||
|
overrides this setting.
|
||||||
|
|
|
@ -300,15 +300,14 @@ ifndef::git-format-patch[]
|
||||||
with --exit-code.
|
with --exit-code.
|
||||||
|
|
||||||
--ws-error-highlight=<kind>::
|
--ws-error-highlight=<kind>::
|
||||||
Highlight whitespace errors on lines specified by <kind>
|
Highlight whitespace errors in the `context`, `old` or `new`
|
||||||
in the color specified by `color.diff.whitespace`. <kind>
|
lines of the diff. Multiple values are separated by comma,
|
||||||
is a comma separated list of `old`, `new`, `context`. When
|
`none` resets previous values, `default` reset the list to
|
||||||
this option is not given, only whitespace errors in `new`
|
`new` and `all` is a shorthand for `old,new,context`. When
|
||||||
lines are highlighted. E.g. `--ws-error-highlight=new,old`
|
this option is not given, and the configuration variable
|
||||||
highlights whitespace errors on both deleted and added lines.
|
`diff.wsErrorHighlight` is not set, only whitespace errors in
|
||||||
`all` can be used as a short-hand for `old,new,context`.
|
`new` lines are highlighted. The whitespace errors are colored
|
||||||
The `diff.wsErrorHighlight` configuration variable can be
|
whith `color.diff.whitespace`.
|
||||||
used to specify the default behaviour.
|
|
||||||
|
|
||||||
endif::git-format-patch[]
|
endif::git-format-patch[]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue