From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Oct 2025 17:29:30 +0000 (-0700)
Subject: Merge branch 'jk/add-i-color' into maint-2.51
X-Git-Tag: v2.51.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c96ce08fd7fa3a167e7bc18f80fbc348903b1f;p=thirdparty%2Fgit.git

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

b3c96ce08fd7fa3a167e7bc18f80fbc348903b1f