diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-27 19:21:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 19:21:48 (GMT) |
| commit | caac7a3abea717e4320a978bae89cfcdf51203bf (patch) | |
| tree | 99f39f9ddd5eeeeba40347a97b2794a4e29a80a6 /Documentation | |
| parent | ff132a190ec5c99ffd8ff2bef947f230d4ac64c2 (diff) | |
| parent | e479c5f8f380ea54353b96364f66a4496d213733 (diff) | |
| download | git-caac7a3abea717e4320a978bae89cfcdf51203bf.zip git-caac7a3abea717e4320a978bae89cfcdf51203bf.tar.gz git-caac7a3abea717e4320a978bae89cfcdf51203bf.tar.bz2 | |
Merge branch 'jk/pretty-encoding-doc' into maint
Doc update.
* jk/pretty-encoding-doc:
docs: clarify that --encoding can produce invalid sequences
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-options.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 74aa01a..642af6e 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -37,7 +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 |