tree 44fae97cc312ba6841416d5d999594a128eb7071
parent 433b8aac2eb7a8bc3e383a072f7df7d15c4aabbb
parent da8063522f7f797cf722f28979aefbe2a508f800
author Junio C Hamano <gitster@pobox.com> 1581713662 -0800
committer Junio C Hamano <gitster@pobox.com> 1581713662 -0800

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