Merge branch 'ar/decorate-color'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:40 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:40 +0000 (11:55 -0700)
* 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

1  2 
Documentation/config.txt
builtin/log.c
commit.h

Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc commit.h
Simple merge