From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Sep 2025 18:53:40 +0000 (-0700)
Subject: Merge branch 'jk/add-i-color'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e8d7569eae06a7e5052d08c2697b0f1281be9da;p=thirdparty%2Fgit.git

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
---

2e8d7569eae06a7e5052d08c2697b0f1281be9da