Skip to content

Commit 77645b5

Browse files
Denton-Lgitster
authored andcommitted
i18n.txt: camel case and monospace "i18n.commitEncoding"
In 95791be (doc: camelCase the i18n config variables to improve readability, 2017-07-17), the other i18n config variables were camel cased. However, this one instance was missed. Camel case and monospace "i18n.commitEncoding" so that it matches the surrounding text. Signed-off-by: Denton Liu <[email protected]> [jc: fixed 3 other mistakes that are exactly the same] Signed-off-by: Junio C Hamano <[email protected]>
1 parent 59ec224 commit 77645b5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Documentation/git-am.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ OPTIONS
7979
Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
8080
The proposed commit log message taken from the e-mail
8181
is re-coded into UTF-8 encoding (configuration variable
82-
`i18n.commitencoding` can be used to specify project's
82+
`i18n.commitEncoding` can be used to specify project's
8383
preferred encoding if it is not UTF-8).
8484
+
8585
This was optional in prior versions of git, but now it is the

Documentation/git-mailinfo.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ character.
5353
The commit log message, author name and author email are
5454
taken from the e-mail, and after minimally decoding MIME
5555
transfer encoding, re-coded in the charset specified by
56-
i18n.commitencoding (defaulting to UTF-8) by transliterating
56+
`i18n.commitEncoding` (defaulting to UTF-8) by transliterating
5757
them. This used to be optional but now it is the default.
5858
+
5959
Note that the patch is always used as-is without charset
6060
conversion, even with this flag.
6161

6262
--encoding=<encoding>::
6363
Similar to -u. But when re-coding, the charset specified here is
64-
used instead of the one specified by i18n.commitencoding or UTF-8.
64+
used instead of the one specified by `i18n.commitEncoding` or UTF-8.
6565

6666
-n::
6767
Disable all charset re-coding of the metadata.

Documentation/i18n.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ mind.
3838
a warning if the commit log message given to it does not look
3939
like a valid UTF-8 string, unless you explicitly say your
4040
project uses a legacy encoding. The way to say this is to
41-
have i18n.commitencoding in `.git/config` file, like this:
41+
have `i18n.commitEncoding` in `.git/config` file, like this:
4242
+
4343
------------
4444
[i18n]

0 commit comments

Comments
 (0)