From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Sep 2025 20:36:50 +0000 (-0700)
Subject: Merge branch 'jk/add-i-color' into jk/color-variable-fixes
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e335ff31f70aefc91991063cdc05967096bb1be3;p=thirdparty%2Fgit.git

Merge branch 'jk/add-i-color' into jk/color-variable-fixes

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

e335ff31f70aefc91991063cdc05967096bb1be3