From: Junio C Hamano <redacted>
Date: Mon, 22 Dec 2014 20:27:58 +0000 (-0800)
Subject: Merge branch 'jk/colors'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=3dadfc7e173e27db641291d8f049ab487b696704;p=git.git

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
---

3dadfc7e173e27db641291d8f049ab487b696704