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

diff --cc commit.h
index b6ad8f3f307a46cd5a0555ab346abaa20013b13a,73fd399b09ea9a60965d318e5d282c932a50f44e..0f469e507db7b8517e4f37107d855b7877176085
--- 1/commit.h
--- 2/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