summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-04 22:26:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-04 22:49:05 (GMT)
commita17505f262b62e429bb0e188c5ed73ac749e25b8 (patch)
treef50696174df4b24ce70883b4d89b301edb10215e /Documentation/diff-options.txt
parent0b4b42e7fe1b507fb387c18d9a2748768359bf5d (diff)
downloadgit-a17505f262b62e429bb0e188c5ed73ac749e25b8.zip
git-a17505f262b62e429bb0e188c5ed73ac749e25b8.tar.gz
git-a17505f262b62e429bb0e188c5ed73ac749e25b8.tar.bz2
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/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 306b7e3..dfd6bc9 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[]