diff options
| author | Andreas Heiduk <asheiduk@gmail.com> | 2017-07-25 22:53:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-25 14:30:49 -0700 |
| commit | c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0 (patch) | |
| tree | 63e31ae28bb1f8d946896f05501ac4be1fbf38dc /Documentation/diff-config.txt | |
| parent | 95d67879735cfecfdd85f89e59d993c5b4de8835 (diff) | |
| download | git-c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0.tar.gz git-c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0.tar.xz | |
doc: add missing values "none" and "default" for diff.wsErrorHighlight
The values have eluded documentation so far. While at it streamline
the wording by grouping relevant parts together.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 cbce8ec63..5ca942ab5 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. |