]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f06ea7c 1092cd6)
Merge branch 'jk/add-i-color' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:30 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:31 +0000 (10:29 -0700)
commitb3c96ce08fd7fa3a167e7bc18f80fbc348903b1f
tree79c6bbdfc36a754de7550e78789d0c0fb3a5e6eatree | snapshot
parentf06ea7cf3c9e01bb4df0cc5fb2e928b859560fe4commit | diff
parent1092cd6435642808c3e921f0c3c4a7588cc455e6commit | diff
Merge branch 'jk/add-i-color' into maint-2.51

Some among "git add -p" and friends ignored color.diff and/or
color.ui configuration variables, which is an old regression, which
has been corrected.

* jk/add-i-color:
  contrib/diff-highlight: mention interactive.diffFilter
  add-interactive: manually fall back color config to color.ui
  add-interactive: respect color.diff for diff coloring
  stash: pass --no-color to diff plumbing child processes
Unnamed repository; edit this file 'description' to name the repository.