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

Doc update.

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