Skip to content

Commit

Permalink
Merge branch 'jk/pretty-encoding-doc' into maint
Browse files Browse the repository at this point in the history
Doc update.

* jk/pretty-encoding-doc:
  docs: clarify that --encoding can produce invalid sequences
  • Loading branch information
Junio C Hamano committed Jul 27, 2015
2 parents ff132a1 + e479c5f commit caac7a3
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Documentation/pretty-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit caac7a3

Please sign in to comment.