summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-26 15:24:37 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-26 15:24:37 -0700
commit4a401d5d92702e0028f6a84625d0cac6218502f6 (patch)
tree2a4cfb0e8efa777e3084bcb796850963b2f8a6c8 /diff-options.txt
parentc0859f7292882e15477dfc88025e14ce83a625db (diff)
downloadgit-htmldocs-4a401d5d92702e0028f6a84625d0cac6218502f6.tar.gz
Autogenerated HTML docs for v2.10.1-613-g2cc2e
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt
index 2d77a1962..29630c238 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -308,6 +308,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[]