summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorAndreas Heiduk <asheiduk@gmail.com>2017-07-25 20:53:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-25 21:30:49 (GMT)
commitc0bb6d9cef66d132ba33ff4a62eda3a7038b75d0 (patch)
tree63e31ae28bb1f8d946896f05501ac4be1fbf38dc /Documentation/diff-options.txt
parent95d67879735cfecfdd85f89e59d993c5b4de8835 (diff)
downloadgit-c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0.zip
git-c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0.tar.gz
git-c0bb6d9cef66d132ba33ff4a62eda3a7038b75d0.tar.bz2
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-options.txt')
-rw-r--r--Documentation/diff-options.txt17
1 files changed, 8 insertions, 9 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index d91ddbd..5cc7c7e 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -301,15 +301,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[]