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)
commit2927a507bf8080661ed84000ce55465941bd28a9
tree6abfc037ab5ff89d614674f9283432756dc704da
parent54ed6a98fda3765a6ffcac870f79528a48b4c07f
parent567102819ac56ccf7eb638ea8b5c975c03e88558
Merge branch 'ar/decorate-color'

* 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