From: Junio C Hamano Date: Thu, 6 Oct 2016 21:53:12 +0000 (-0700) Subject: Merge branch 'rs/c-auto-resets-attributes' X-Git-Tag: v2.11.0-rc0~77 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/578e6021c0819d7be1179e05e7ce0e6fdb2a01b7 Merge branch 'rs/c-auto-resets-attributes' 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 --- 578e6021c0819d7be1179e05e7ce0e6fdb2a01b7