]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
t/t3701-add-interactive.sh patch | diff1 | diff2 | blob | history

diff --cc t/t3701-add-interactive.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.