Merge branch 'jk/pretty-encoding-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jul 2015 19:21:48 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jul 2015 19:21:48 +0000 (12:21 -0700)
Doc update.

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

1  2 
Documentation/pretty-options.txt

Simple merge