mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'ks/doc-fixes' into maint
Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability
This commit is contained in:
commit
0baf0b839b
|
@ -196,11 +196,12 @@ whitespace::
|
|||
verbatim::
|
||||
Do not change the message at all.
|
||||
scissors::
|
||||
Same as `whitespace`, except that everything from (and
|
||||
including) the line
|
||||
"`# ------------------------ >8 ------------------------`"
|
||||
is truncated if the message is to be edited. "`#`" can be
|
||||
customized with core.commentChar.
|
||||
Same as `whitespace` except that everything from (and including)
|
||||
the line found below is truncated, if the message is to be edited.
|
||||
"`#`" can be customized with core.commentChar.
|
||||
|
||||
# ------------------------ >8 ------------------------
|
||||
|
||||
default::
|
||||
Same as `strip` if the message is to be edited.
|
||||
Otherwise `whitespace`.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue