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