summaryrefslogtreecommitdiffstats
path: root/pretty-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-10 12:54:21 -0700
committerJunio C Hamano <gitster@pobox.com>2021-09-10 12:54:21 -0700
commit7d6f46e6146b1934447203aaec7403cbc44c7710 (patch)
tree2392827358bf0e6396238d97b4f447b956b8a9a0 /pretty-options.txt
parent810dc8f1583cea4aa8bebdfbbc5da4b72f4b0b20 (diff)
downloadgit-htmldocs-7d6f46e6146b1934447203aaec7403cbc44c7710.tar.gz
Autogenerated HTML docs for v2.33.0-328-g8b7c1
Diffstat (limited to 'pretty-options.txt')
-rw-r--r--pretty-options.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/pretty-options.txt b/pretty-options.txt
index 27ddaf84a..b3af85060 100644
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -33,14 +33,16 @@ people using 80-column terminals.
used together.
--encoding=<encoding>::
- The commit objects record the encoding used for the log message
+ Commit objects record the character encoding used for the log message
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. 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.
+ commit may be copied to the output. Likewise, if iconv(3) fails
+ to convert the commit, we will output the original object
+ verbatim, along with a warning.
--expand-tabs=<n>::
--expand-tabs::