]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2be606a 1092cd6)
Merge branch 'jk/add-i-color'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Sep 2025 18:53:40 +0000 (11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Sep 2025 18:53:40 +0000 (11:53 -0700)
commit2e8d7569eae06a7e5052d08c2697b0f1281be9da
treea700bcbb594b7a791319c6a776d00fa93ca82abftree | snapshot
parent2be606a3bd1c916fcc14435556a807c6f5b5ce14commit | diff
parent1092cd6435642808c3e921f0c3c4a7588cc455e6commit | diff
Merge branch 'jk/add-i-color'

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
builtin/stash.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.