diff-highlight: allow configurable colors
authorJeff King <peff@peff.net>
Thu, 20 Nov 2014 15:29:18 +0000 (10:29 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Nov 2014 20:43:16 +0000 (12:43 -0800)
commitbca45fbc1f8fe0daa76e840fa2ad4a9c663500a0
tree1a49626b64433000c0afc8bca9b19c86c5475f7e
parentff40d185d25ce821bd6ae5a524e58e4eab01dc86
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>
contrib/diff-highlight/README
contrib/diff-highlight/diff-highlight