From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Jun 2016 18:01:01 +0000 (-0700)
Subject: Merge branch 'et/pretty-format-c-auto'
X-Git-Tag: v2.10.0-rc0~199
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1b3d14c1c89d8ad61be97a1f2d2606a07b25872b?hp=--cc

Merge branch 'et/pretty-format-c-auto'

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

1b3d14c1c89d8ad61be97a1f2d2606a07b25872b