diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-23 11:53:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-23 11:53:40 -0700 |
| commit | 2e8d7569eae06a7e5052d08c2697b0f1281be9da (patch) | |
| tree | a700bcbb594b7a791319c6a776d00fa93ca82abf /contrib | |
| parent | 2be606a3bd1c916fcc14435556a807c6f5b5ce14 (diff) | |
| parent | 1092cd6435642808c3e921f0c3c4a7588cc455e6 (diff) | |
| download | git-2e8d7569eae06a7e5052d08c2697b0f1281be9da.tar.xz | |
Merge branch 'jk/add-i-color'
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 ------------ |