Merge branch 'rs/pretty-format-color-doc-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:23 +0000 (09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:23 +0000 (09:01 -0700)
commit4efd8e6...d3c806b840d1e167762861d8154cd7ed
tree891f149...0931377327f716c16c419fd2ef4147a1copy hash to clipboard (tree)
parent9a82d8f...0b778664c5178b27b17a5dbbac5e9d21copy hash to clipboard (diff)
parent30cfe72...37ed8c174cae43923769730a94549daecopy hash to clipboard (diff)
Documentation/pretty-formats.txt