From: Junio C Hamano Date: Mon, 27 Jul 2015 19:21:48 +0000 (-0700) Subject: Merge branch 'jk/pretty-encoding-doc' into maint X-Git-Tag: v2.4.7~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/caac7a3abea717e4320a978bae89cfcdf51203bf?hp=-c Merge branch 'jk/pretty-encoding-doc' into maint Doc update. * jk/pretty-encoding-doc: docs: clarify that --encoding can produce invalid sequences --- caac7a3abea717e4320a978bae89cfcdf51203bf diff --combined Documentation/pretty-options.txt index 74aa01a0ec,f384673c08..642af6e426 --- a/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 '' can be one of 'oneline', 'short', 'medium', - 'full', 'fuller', 'email', 'raw' and 'format:'. See - the "PRETTY FORMATS" section for some additional details for each - format. When omitted, the format defaults to 'medium'. + 'full', 'fuller', 'email', 'raw', 'format:' + and 'tformat:'. When '' is none of the above, + and has '%placeholder' in it, it acts as if + '--pretty=tformat:' were given. ++ +See the "PRETTY FORMATS" section for some additional details for each +format. When '=' 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[=]:: Show the notes (see linkgit:git-notes[1]) that annotate the