diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:31 -0700 |
| commit | b3c96ce08fd7fa3a167e7bc18f80fbc348903b1f (patch) | |
| tree | 79c6bbdfc36a754de7550e78789d0c0fb3a5e6ea /contrib | |
| parent | Merge branch 'sg/line-log-boundary-fixes' into maint-2.51 (diff) | |
| parent | contrib/diff-highlight: mention interactive.diffFilter (diff) | |
| download | git-b3c96ce08fd7fa3a167e7bc18f80fbc348903b1f.tar.gz git-b3c96ce08fd7fa3a167e7bc18f80fbc348903b1f.zip | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/diff-highlight/README | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/diff-highlight/README b/contrib/diff-highlight/README index d4c2343175..1db4440e68 100644 --- a/contrib/diff-highlight/README +++ b/contrib/diff-highlight/README @@ -58,6 +58,14 @@ following in your git configuration: diff = diff-highlight | less --------------------------------------------- +If you use the interactive patch mode of `git add -p`, `git checkout +-p`, etc, you may also want to configure it to be used there: + +--------------------------------------------- +[interactive] + diffFilter = diff-highlight +--------------------------------------------- + Color Config ------------ |