summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-26 20:14:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-26 20:14:43 (GMT)
commite5272d304af3528163cd5faa822f88086448ae57 (patch)
tree3790db42783219a328cfd83be301fbb3ee7eb0df /Documentation/diff-options.txt
parentc334effa2332e30199451695b148f02eb7d9fd13 (diff)
parenta17505f262b62e429bb0e188c5ed73ac749e25b8 (diff)
downloadgit-e5272d304af3528163cd5faa822f88086448ae57.zip
git-e5272d304af3528163cd5faa822f88086448ae57.tar.gz
git-e5272d304af3528163cd5faa822f88086448ae57.tar.bz2
Merge branch 'jc/ws-error-highlight'
"git diff/log --ws-error-highlight=<kind>" lacked the corresponding configuration variable to set it by default. * jc/ws-error-highlight: diff: introduce diff.wsErrorHighlight option diff.c: move ws-error-highlight parsing helpers up diff.c: refactor parse_ws_error_highlight() t4015: split out the "setup" part of ws-error-highlight test
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 2d77a19..29630c2 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/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[]