| commit | 3dadfc7e173e27db641291d8f049ab487b696704 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Dec 2014 20:27:58 +0000 (22 12:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Dec 2014 20:27:58 +0000 (22 12:27 -0800) | ||
| tree | 6d5f730dc8994fe9135278eab8790ac342285851 | treesnapshot (tar.gz zip) |
| parent | d539eb9d25fdb9a7d820596eb11b04960d8d09ee | commitdiff |
| parent | 71b59849753589c3faa04176e875071417ceddd5 | commitdiff |
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
"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 | diff1 | diff2 | blobhistory |
| contrib/diff-highlight/diff-highlight | diff1 | diff2 | blobhistory |