summaryrefslogtreecommitdiffstats
path: root/pretty-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-10 15:29:34 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-10 15:29:34 -0700
commit823eebb8a31b328e252543cfa25ebf5c575fa6d8 (patch)
treedfd5992a4dc3ebf603b43ea8b24f3c47e7b7796d /pretty-options.txt
parent2f7978279c72985d4856b2bd0fdde97473366213 (diff)
downloadgit-htmldocs-823eebb8a31b328e252543cfa25ebf5c575fa6d8.tar.gz
Autogenerated HTML docs for v2.5.0-rc1-32-ge59f6
Diffstat (limited to 'pretty-options.txt')
-rw-r--r--pretty-options.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/pretty-options.txt b/pretty-options.txt
index 74aa01a0e..642af6e42 100644
--- a/pretty-options.txt
+++ b/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