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)
Small doc update.

* rs/pretty-format-color-doc-fix:
pretty: fix document link for color specification

1  2 
Documentation/pretty-formats.txt
Simple merge