summaryrefslogtreecommitdiffstats
path: root/git-mailinfo.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
committerJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
commita372d5bb569776befd395d9c66067ecc09f13b96 (patch)
treee9f46a0ff18a8d49520307068a47e8944c44aa3d /git-mailinfo.txt
parenta70c988a0584e1197ffd19b26c28e9790da32363 (diff)
downloadgit-htmldocs-a372d5bb569776befd395d9c66067ecc09f13b96.tar.gz
Autogenerated HTML docs for v2.31.0-rc0
Diffstat (limited to 'git-mailinfo.txt')
-rw-r--r--git-mailinfo.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mailinfo.txt b/git-mailinfo.txt
index 7a6aed0e3..d343f040f 100644
--- a/git-mailinfo.txt
+++ b/git-mailinfo.txt
@@ -53,7 +53,7 @@ character.
The commit log message, author name and author email are
taken from the e-mail, and after minimally decoding MIME
transfer encoding, re-coded in the charset specified by
- i18n.commitencoding (defaulting to UTF-8) by transliterating
+ `i18n.commitEncoding` (defaulting to UTF-8) by transliterating
them. This used to be optional but now it is the default.
+
Note that the patch is always used as-is without charset
@@ -61,7 +61,7 @@ conversion, even with this flag.
--encoding=<encoding>::
Similar to -u. But when re-coding, the charset specified here is
- used instead of the one specified by i18n.commitencoding or UTF-8.
+ used instead of the one specified by `i18n.commitEncoding` or UTF-8.
-n::
Disable all charset re-coding of the metadata.