diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 11:32:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 11:32:37 -0700 |
| commit | 4b2a6c149b267a1120f1444a0951af13d7b36d69 (patch) | |
| tree | 5c68e72eebbfb448458790b8350ba417b3d93654 /diff-options.txt | |
| parent | 65314ca2cdc18a564335d61f615f5f6da04c0f97 (diff) | |
| download | git-htmldocs-4b2a6c149b267a1120f1444a0951af13d7b36d69.tar.gz | |
Autogenerated HTML docs for v2.14.1-248-gf0294f
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/diff-options.txt b/diff-options.txt index 43d18a4c5..56dedafcd 100644 --- a/diff-options.txt +++ b/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[] |