Merge branch 'rs/c-auto-resets-attributes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2016 21:53:12 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2016 21:53:12 +0000 (14:53 -0700)
When "%C(auto)" appears at the very beginning of the pretty format
string, it did not need to issue the reset sequence, but it did.

* rs/c-auto-resets-attributes:
pretty: avoid adding reset for %C(auto) if output is empty

1  2 
pretty.c
diff --cc pretty.c
Simple merge