Merge branch 'jk/colors'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:58 +0000 (12:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:58 +0000 (12:27 -0800)
commit3dadfc7e173e27db641291d8f049ab487b696704
tree6d5f730dc8994fe9135278eab8790ac342285851
parentd539eb9d25fdb9a7d820596eb11b04960d8d09ee
parent71b59849753589c3faa04176e875071417ceddd5
Merge branch 'jk/colors'

"diff-highlight" filter (in contrib/) allows its color output
to be customized via configuration variables.

* jk/colors:
  parse_color: drop COLOR_BACKGROUND macro
  diff-highlight: allow configurable colors
  parse_color: recognize "no$foo" to clear the $foo attribute
  parse_color: support 24-bit RGB values
  parse_color: refactor color storage
Documentation/config.txt
contrib/diff-highlight/diff-highlight