From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:54:22 +0000 (-0800)
Subject: Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
X-Git-Tag: v2.26.0-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df04a316176d5ba44422c2c6b0cb1a9fc31901e5;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'

The diff-* plumbing family of subcommands now pay attention to the
diff.wsErrorHighlight configuration, which has been ignored before;
this allows "git add -p" to also show the whitespace problems to
the end user.

* jk/diff-honor-wserrhighlight-in-plumbing:
  diff: move diff.wsErrorHighlight to "basic" config
---

df04a316176d5ba44422c2c6b0cb1a9fc31901e5