summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-11-20 10:29:18 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-20 12:43:16 -0800
commitbca45fbc1f8fe0daa76e840fa2ad4a9c663500a0 (patch)
tree1a49626b64433000c0afc8bca9b19c86c5475f7e /builtin
parentparse_color: recognize "no$foo" to clear the $foo attribute (diff)
downloadtgif-bca45fbc1f8fe0daa76e840fa2ad4a9c663500a0.tar.xz
diff-highlight: allow configurable colors
Until now, the highlighting colors were hard-coded in the script (as "reverse" and "noreverse"), and you had to edit the script to change them. This patch teaches diff-highlight to read from color.diff-highlight.* to set them. In addition, it expands the possiblities considerably by adding two features: 1. Old/new lines can be colored independently (so you can use a color scheme that complements existing line coloring). 2. Normal, unhighlighted parts of the lines can be colored, too. Technically this can be done by separately configuring color.diff.old/new and matching it to your diff-highlight colors. But you may want a different look for your highlighted diffs versus your regular diffs. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions