From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2016 23:09:15 +0000 (-0700)
Subject: Merge branch 'rs/c-auto-resets-attributes'
X-Git-Tag: v2.11.0-rc0~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3e588a48af0ce15832c240887b9a3f9361d22bb;p=thirdparty%2Fgit.git

Merge branch 'rs/c-auto-resets-attributes'

The pretty-format specifier "%C(auto)" used by the "log" family of
commands to enable coloring of the output is taught to also issue a
color-reset sequence to the output.

* rs/c-auto-resets-attributes:
  pretty: let %C(auto) reset all attributes
---

b3e588a48af0ce15832c240887b9a3f9361d22bb