diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-04 15:26:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-04 15:49:05 -0700 |
| commit | a17505f262b62e429bb0e188c5ed73ac749e25b8 (patch) | |
| tree | f50696174df4b24ce70883b4d89b301edb10215e /Documentation | |
| parent | 0b4b42e7fe1b507fb387c18d9a2748768359bf5d (diff) | |
| download | git-a17505f262b62e429bb0e188c5ed73ac749e25b8.tar.gz git-a17505f262b62e429bb0e188c5ed73ac749e25b8.tar.xz | |
diff: introduce diff.wsErrorHighlight option
With the preparatory steps, it has become trivial to teach the
system a new diff.wsErrorHighlight configuration that gives the
default value for --ws-error-highlight command line option.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-config.txt | 6 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 6eaa45271..c0396e66a 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -182,3 +182,9 @@ diff.algorithm:: low-occurrence common elements". -- + + +diff.wsErrorHighlight:: + A comma separated list of `old`, `new`, `context`, that + specifies how whitespace errors on lines are highlighted + with `color.diff.whitespace`. Can be overridden by the + command line option `--ws-error-highlight=<kind>` diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 306b7e360..dfd6bc99c 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -303,6 +303,8 @@ ifndef::git-format-patch[] 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. endif::git-format-patch[] |