From: Junio C Hamano Date: Mon, 27 Jun 2016 16:56:23 +0000 (-0700) Subject: Merge branch 'et/pretty-format-c-auto' into maint X-Git-Tag: v2.9.1~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbb4138cb2e6b77d1d8386f336e7813fcfd3cb02;p=thirdparty%2Fgit.git Merge branch 'et/pretty-format-c-auto' into maint The commands in `git log` family take %C(auto) in a custom format string. This unconditionally turned the color on, ignoring --no-color or with --color=auto when the output is not connected to a tty; this was corrected to make the format truly behave as "auto". * et/pretty-format-c-auto: format_commit_message: honor `color=auto` for `%C(auto)` --- fbb4138cb2e6b77d1d8386f336e7813fcfd3cb02