summaryrefslogtreecommitdiffstats
path: root/git-am.html
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-am.html
parenta70c988a0584e1197ffd19b26c28e9790da32363 (diff)
downloadgit-htmldocs-a372d5bb569776befd395d9c66067ecc09f13b96.tar.gz
Autogenerated HTML docs for v2.31.0-rc0
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html
index 648112846..d15e32b83 100644
--- a/git-am.html
+++ b/git-am.html
@@ -892,7 +892,7 @@ current branch.</p></div>
Pass <code>-u</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
The proposed commit log message taken from the e-mail
is re-coded into UTF-8 encoding (configuration variable
- <code>i18n.commitencoding</code> can be used to specify project&#8217;s
+ <code>i18n.commitEncoding</code> can be used to specify project&#8217;s
preferred encoding if it is not UTF-8).
</p>
<div class="paragraph"><p>This was optional in prior versions of git, but now it is the
@@ -1198,7 +1198,7 @@ information.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-11-02 14:02:22 PST
+ 2021-02-25 17:29:29 PST
</div>
</div>
</body>