Merge branch 'jk/pretty-encoding-doc'

Doc update.

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

diff --combined Documentation/pretty-options.txt
index 74aa01a0ec27b6cc0fbb9763b8e583a3f996da25,f384673c085b7277437294ed6b778f0dec0e93fa..642af6e42684602f5465fc3c61d83ca6309b34cb
--- 1/Documentation/pretty-options.txt
--- 2/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@@ -3,13 -3,9 +3,13 @@@
  
        Pretty-print the contents of the commit logs in a given format,
        where '<format>' can be one of 'oneline', 'short', 'medium',
 -      'full', 'fuller', 'email', 'raw' and 'format:<string>'.  See
 -      the "PRETTY FORMATS" section for some additional details for each
 -      format.  When omitted, the format defaults to 'medium'.
 +      'full', 'fuller', 'email', 'raw', 'format:<string>'
 +      and 'tformat:<string>'.  When '<format>' is none of the above,
 +      and has '%placeholder' in it, it acts as if
 +      '--pretty=tformat:<format>' were given.
 ++
 +See the "PRETTY FORMATS" section for some additional details for each
 +format.  When '=<format>' part is omitted, it defaults to 'medium'.
  +
  Note: you can specify the default pretty format in the repository
  configuration (see linkgit:git-config[1]).
@@@ -37,7 -33,10 +37,10 @@@ people using 80-column terminals
        in their encoding header; this option can be used to tell the
        command to re-code the commit log message in the encoding
        preferred by the user.  For non plumbing commands this
-       defaults to UTF-8.
+       defaults to UTF-8. Note that if an object claims to be encoded
+       in `X` and we are outputting in `X`, we will output the object
+       verbatim; this means that invalid sequences in the original
+       commit may be copied to the output.
  
  --notes[=<ref>]::
        Show the notes (see linkgit:git-notes[1]) that annotate the