diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-16 13:36:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-16 13:36:50 -0700 |
| commit | e335ff31f70aefc91991063cdc05967096bb1be3 (patch) | |
| tree | 57afc99df17a39dddd5e04369347d3024ba7e085 /diff.c | |
| parent | Git 2.51 (diff) | |
| parent | contrib/diff-highlight: mention interactive.diffFilter (diff) | |
| download | git-e335ff31f70aefc91991063cdc05967096bb1be3.tar.gz git-e335ff31f70aefc91991063cdc05967096bb1be3.zip | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions