path: root/Documentation/diff-options.txt
diff options
authorJunio C Hamano <>2017-08-11 20:27:04 (GMT)
committerJunio C Hamano <>2017-08-11 20:27:04 (GMT)
commit4c244c25f044b62d2555746d947249215e7c55a7 (patch)
treea17dc1acc45285a13d2cb82f985301a50b2c05c5 /Documentation/diff-options.txt
parentafb456a3835b8b22ec6420807243df480a61d815 (diff)
parentc0bb6d9cef66d132ba33ff4a62eda3a7038b75d0 (diff)
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-options.txt')
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.
- 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`.