From: Andreas Heiduk Date: Mon, 24 Jul 2017 22:30:21 GMT Subject: [PATCH] doc: add missing "none" value for diff.wsErrorHighlight Message-ID: <20170724223021.9124-1-asheiduk@gmail.com> The value has not eluded documentation so far. Signed-off-by: Andreas Heiduk --- Documentation/diff-config.txt | 2 +- Documentation/diff-options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index cbce8ec63..c84ced8f6 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -200,7 +200,7 @@ diff.algorithm:: + diff.wsErrorHighlight:: - A comma separated list of `old`, `new`, `context`, that + A comma separated list of `old`, `new`, `context` and `none`, that specifies how whitespace errors on lines are highlighted with `color.diff.whitespace`. Can be overridden by the command line option `--ws-error-highlight=` diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 89cc0f48d..903d68eb7 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -302,7 +302,7 @@ ifndef::git-format-patch[] --ws-error-highlight=:: Highlight whitespace errors on lines specified by in the color specified by `color.diff.whitespace`. - is a comma separated list of `old`, `new`, `context`. When + is a comma separated list of `old`, `new`, `context` and `none`. 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. -- 2.13.3