]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 433b8aa da80635)
Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:22 +0000 (12:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:22 +0000 (12:54 -0800)
commitdf04a316176d5ba44422c2c6b0cb1a9fc31901e5
tree44fae97cc312ba6841416d5d999594a128eb7071tree | snapshot
parent433b8aac2eb7a8bc3e383a072f7df7d15c4aabbbcommit | diff
parentda8063522f7f797cf722f28979aefbe2a508f800commit | diff
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
t/t3701-add-interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.