summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 21:33:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-23 21:33:51 (GMT)
commitb55b936038ba66233fb765b7b46ed6852dc8fdfb (patch)
treedf3750929bb0a41f16db1dce3621fac3d2e1ecea /Documentation/diff-options.txt
parentd0dffcacf3a721789984aed5a5e0af738b1d9f36 (diff)
parentc0bb6d9cef66d132ba33ff4a62eda3a7038b75d0 (diff)
downloadgit-b55b936038ba66233fb765b7b46ed6852dc8fdfb.zip
git-b55b936038ba66233fb765b7b46ed6852dc8fdfb.tar.gz
git-b55b936038ba66233fb765b7b46ed6852dc8fdfb.tar.bz2
Merge branch 'ah/doc-wserrorhighlight' into maint
Doc update. * ah/doc-wserrorhighlight: doc: add missing values "none" and "default" for diff.wsErrorHighlight
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 43d18a4..56dedaf 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -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[]