Merge branch 'jk/pretty-encoding-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:17:53 +0000 (14:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:17:54 +0000 (14:17 -0700)
Doc update.

* jk/pretty-encoding-doc:
  docs: clarify that --encoding can produce invalid sequences

1  2 
Documentation/pretty-options.txt

Simple merge