Merge branch 'rs/pretty-format-color-doc-fix' into maint
commit4efd8e64d3c806b840d1e167762861d8154cd7ed
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:23 +0000 (28 09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:23 +0000 (28 09:01 -0700)
tree891f14920931377327f716c16c419fd2ef4147a1
parent9a82d8fd0b778664c5178b27b17a5dbbac5e9d21
parent30cfe72d37ed8c174cae43923769730a94549dae
Merge branch 'rs/pretty-format-color-doc-fix' into maint

Small doc update.

* rs/pretty-format-color-doc-fix:
  pretty: fix document link for color specification
Documentation/pretty-formats.txt