diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:04 -0700 |
| commit | 4c244c25f044b62d2555746d947249215e7c55a7 (patch) | |
| tree | a17dc1acc45285a13d2cb82f985301a50b2c05c5 /Documentation/diff-config.txt | |
| parent | Merge branch 'cc/ref-is-hidden-microcleanup' (diff) | |
| parent | doc: add missing values "none" and "default" for diff.wsErrorHighlight (diff) | |
| download | tgif-4c244c25f044b62d2555746d947249215e7c55a7.tar.xz | |
Merge branch 'ah/doc-wserrorhighlight'
Doc update.
* ah/doc-wserrorhighlight:
doc: add missing values "none" and "default" for diff.wsErrorHighlight
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index cbce8ec638..5ca942ab5e 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -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. |