]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c44beea 1092cd6)
Merge branch 'jk/add-i-color' into jk/color-variable-fixes
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2025 20:36:50 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Sep 2025 20:36:50 +0000 (13:36 -0700)
commite335ff31f70aefc91991063cdc05967096bb1be3
tree57afc99df17a39dddd5e04369347d3024ba7e085tree | snapshot
parentc44beea485f0f2feaf460e2ac87fdd5608d63cf0commit | diff
parent1092cd6435642808c3e921f0c3c4a7588cc455e6commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.