Merge branch 'ah/doc-pretty-color-auto-prefix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:05 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:59:05 +0000 (13:59 -0700)
commit76de71b4879003ce2c2a7f9ac22e059183e00e11
tree6319192aa1baca6348545f5c6b9b228c4f4a9e98
parentcf77911ae51b95bb6cd92216e6ff1a1afc60b3cc
parent8592c95cdfb476dff5c9e18c185289927601236d
Merge branch 'ah/doc-pretty-color-auto-prefix' into maint

Doc update.

* ah/doc-pretty-color-auto-prefix:
  doc: clarify syntax for %C(auto,...) in pretty formats
Documentation/pretty-formats.txt