Skip to content

Commit 38eb932

Browse files
frekuiJunio C Hamano
authored andcommitted
Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 256c3fe commit 38eb932

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Documentation/i18n.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,31 @@ mind.
2525
an warning if the commit log message given to it does not look
2626
like a valid UTF-8 string, unless you explicitly say your
2727
project uses a legacy encoding. The way to say this is to
28-
have core.commitencoding in `.git/config` file, like this:
28+
have i18n.commitencoding in `.git/config` file, like this:
2929
+
3030
------------
31-
[core]
31+
[i18n]
3232
commitencoding = ISO-8859-1
3333
------------
3434
+
3535
Commit objects created with the above setting record the value
36-
of `core.commitencoding` in its `encoding` header. This is to
36+
of `i18n.commitencoding` in its `encoding` header. This is to
3737
help other people who look at them later. Lack of this header
3838
implies that the commit log message is encoded in UTF-8.
3939

4040
. `git-log`, `git-show` and friends looks at the `encoding`
4141
header of a commit object, and tries to re-code the log
4242
message into UTF-8 unless otherwise specified. You can
4343
specify the desired output encoding with
44-
`core.logoutputencoding` in `.git/config` file, like this:
44+
`i18n.logoutputencoding` in `.git/config` file, like this:
4545
+
4646
------------
47-
[core]
47+
[i18n]
4848
logoutputencoding = ISO-8859-1
4949
------------
5050
+
5151
If you do not have this configuration variable, the value of
52-
`core.commitencoding` is used instead.
52+
`i18n.commitencoding` is used instead.
5353

5454
Note that we deliberately chose not to re-code the commit log
5555
message when a commit is made to force UTF-8 at the commit

0 commit comments

Comments
 (0)