Merge branch 'jc/format-color-auto'
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)
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

1  2 
commit.h
log-tree.c
pretty.c

diff --cc commit.h
+++ b/commit.h
@@@ -86,9 -86,10 +86,10 @@@ struct pretty_print_context 
        enum date_mode date_mode;
        unsigned date_mode_explicit:1;
        int need_8bit_cte;
 -      int show_notes;
 +      char *notes_message;
        struct reflog_walk_info *reflog_info;
        const char *output_encoding;
+       int color;
  };
  
  struct userformat_want {
diff --cc log-tree.c
Simple merge
diff --cc pretty.c
Simple merge