Merge branch 'jc/format-color-auto'
commit946a5aee3e896aa12cb9d4d21079c6e299baad81
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:57 +0000 (5 23:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:57 +0000 (5 23:41 -0800)
tree86bc33d1262dfec0a36bbca5b0825298189bb710
parentd2638e1561012e0f5b473ab43ef76c4ff0d12a9f
parent30825178fb72e3664bd1bda7c02c62e300e2e5ce
Merge branch 'jc/format-color-auto'

Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
not color its output when writing to a non-terminal.

* jc/format-color-auto:
  log --format: teach %C(auto,black) to respect color config
  t6006: clean up whitespace
commit.h
log-tree.c
pretty.c