Merge branch 'rs/c-auto-resets-attributes' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:11 +0000 (09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:11 +0000 (09:01 -0700)
commit76796d4...4a21b1def8752c686708253a45721381
treefb169e7...2c83491940513d4228aff82984a2c5a2copy hash to clipboard (tree)
parent03969df...8f6ab2e399df7e156c72d5b965388d2fcopy hash to clipboard (diff)
parent82b83da...d30fb8d1f04f7dd7ac769ceb6ab431c3copy hash to clipboard (diff)
pretty.c