From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jun 2010 18:55:40 +0000 (-0700)
Subject: Merge branch 'ar/decorate-color'
X-Git-Tag: v1.7.2-rc1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2927a507bf8080661ed84000ce55465941bd28a9;p=git.git

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
---

2927a507bf8080661ed84000ce55465941bd28a9