summaryrefslogtreecommitdiffstats
path: root/i18n.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-21 15:42:28 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-21 15:42:28 -0700
commitbb34c10b2b5ad6f0828f0f5f85e7e020c137abe6 (patch)
tree5916f643ba5c9fc8c14dc2aff750cd404b718e64 /i18n.txt
parentf29330e1f4e0be393846605cb15e31a79ba785bb (diff)
downloadgit-htmldocs-bb34c10b2b5ad6f0828f0f5f85e7e020c137abe6.tar.gz
Autogenerated HTML docs for v2.14.0-rc0-40-g5eada
Diffstat (limited to 'i18n.txt')
-rw-r--r--i18n.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/i18n.txt b/i18n.txt
index 2dd79db5c..7e36e5b55 100644
--- a/i18n.txt
+++ b/i18n.txt
@@ -42,11 +42,11 @@ mind.
+
------------
[i18n]
- commitencoding = ISO-8859-1
+ commitEncoding = ISO-8859-1
------------
+
Commit objects created with the above setting record the value
-of `i18n.commitencoding` in its `encoding` header. This is to
+of `i18n.commitEncoding` in its `encoding` header. This is to
help other people who look at them later. Lack of this header
implies that the commit log message is encoded in UTF-8.
@@ -54,15 +54,15 @@ implies that the commit log message is encoded in UTF-8.
`encoding` header of a commit object, and try to re-code the
log message into UTF-8 unless otherwise specified. You can
specify the desired output encoding with
- `i18n.logoutputencoding` in `.git/config` file, like this:
+ `i18n.logOutputEncoding` in `.git/config` file, like this:
+
------------
[i18n]
- logoutputencoding = ISO-8859-1
+ logOutputEncoding = ISO-8859-1
------------
+
If you do not have this configuration variable, the value of
-`i18n.commitencoding` is used instead.
+`i18n.commitEncoding` is used instead.
Note that we deliberately chose not to re-code the commit log
message when a commit is made to force UTF-8 at the commit