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)
commitcaac7a3abea717e4320a978bae89cfcdf51203bf
tree99f39f9ddd5eeeeba40347a97b2794a4e29a80a6
parentff132a190ec5c99ffd8ff2bef947f230d4ac64c2
parente479c5f8f380ea54353b96364f66a4496d213733
Merge branch 'jk/pretty-encoding-doc' into maint

Doc update.

* jk/pretty-encoding-doc:
  docs: clarify that --encoding can produce invalid sequences
Documentation/pretty-options.txt