Merge branch 'ar/decorate-color' into next
commit2d729996a14980ddcbc42174e2452b63da94fa9b
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:52:08 +0000 (30 11:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:52:08 +0000 (30 11:52 -0700)
treed918bdb5d1fc134d64dae1495a273bae0d650965
parentbe16ac8cc8ce693c6adf37b80db65d10a41b4eb9
parent567102819ac56ccf7eb638ea8b5c975c03e88558
Merge branch 'ar/decorate-color' into next

* ar/decorate-color:
  Add test for correct coloring of git log --decoration
  Allow customizable commit decorations colors
  log --decorate: Colorize commit decorations
  log-tree.c: Use struct name_decoration's type for classifying decoration
  commit.h: add 'type' to struct name_decoration
Documentation/config.txt
builtin/log.c
commit.h