Merge branch 'jk/color-parse'
commit35e6afd4c6bc73cba7bc279ff43b498389bf805a
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:50:34 +0000 (21 16:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:50:34 +0000 (21 16:50 -0800)
tree9fb4d4137ada34fa48e2424ce56b52879a637611
parenta14f15427bca9af70127f26cd3cb0fcd78c8d36f
parent2c2dc7c82cea66c5030583233c73593e0f5a8fdb
Merge branch 'jk/color-parse'

* jk/color-parse:
  Optimize color_parse_mem
  expand --pretty=format color options
  color: make it easier for non-config to parse color specs
pretty.c