mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'dl/doc-config-camelcase'
A handful of multi-word configuration variable names in documentation that are spelled in all lowercase have been corrected to use the more canonical camelCase. * dl/doc-config-camelcase: index-format doc: camelCase core.excludesFile blame-options.txt: camelcase blame.blankBoundary i18n.txt: camel case and monospace "i18n.commitEncoding"
This commit is contained in:
commit
09e72204f8
|
@ -1,6 +1,6 @@
|
|||
-b::
|
||||
Show blank SHA-1 for boundary commits. This can also
|
||||
be controlled via the `blame.blankboundary` config option.
|
||||
be controlled via the `blame.blankBoundary` config option.
|
||||
|
||||
--root::
|
||||
Do not treat root commits as boundaries. This can also be
|
||||
|
|
|
@ -79,7 +79,7 @@ OPTIONS
|
|||
Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
|
||||
The proposed commit log message taken from the e-mail
|
||||
is re-coded into UTF-8 encoding (configuration variable
|
||||
`i18n.commitencoding` can be used to specify project's
|
||||
`i18n.commitEncoding` can be used to specify project's
|
||||
preferred encoding if it is not UTF-8).
|
||||
+
|
||||
This was optional in prior versions of git, but now it is the
|
||||
|
|
|
@ -53,7 +53,7 @@ character.
|
|||
The commit log message, author name and author email are
|
||||
taken from the e-mail, and after minimally decoding MIME
|
||||
transfer encoding, re-coded in the charset specified by
|
||||
i18n.commitencoding (defaulting to UTF-8) by transliterating
|
||||
`i18n.commitEncoding` (defaulting to UTF-8) by transliterating
|
||||
them. This used to be optional but now it is the default.
|
||||
+
|
||||
Note that the patch is always used as-is without charset
|
||||
|
@ -61,7 +61,7 @@ conversion, even with this flag.
|
|||
|
||||
--encoding=<encoding>::
|
||||
Similar to -u. But when re-coding, the charset specified here is
|
||||
used instead of the one specified by i18n.commitencoding or UTF-8.
|
||||
used instead of the one specified by `i18n.commitEncoding` or UTF-8.
|
||||
|
||||
-n::
|
||||
Disable all charset re-coding of the metadata.
|
||||
|
|
|
@ -38,7 +38,7 @@ mind.
|
|||
a warning if the commit log message given to it does not look
|
||||
like a valid UTF-8 string, unless you explicitly say your
|
||||
project uses a legacy encoding. The way to say this is to
|
||||
have i18n.commitencoding in `.git/config` file, like this:
|
||||
have `i18n.commitEncoding` in `.git/config` file, like this:
|
||||
+
|
||||
------------
|
||||
[i18n]
|
||||
|
|
|
@ -273,14 +273,14 @@ Git index format
|
|||
- Stat data of $GIT_DIR/info/exclude. See "Index entry" section from
|
||||
ctime field until "file size".
|
||||
|
||||
- Stat data of core.excludesfile
|
||||
- Stat data of core.excludesFile
|
||||
|
||||
- 32-bit dir_flags (see struct dir_struct)
|
||||
|
||||
- Hash of $GIT_DIR/info/exclude. A null hash means the file
|
||||
does not exist.
|
||||
|
||||
- Hash of core.excludesfile. A null hash means the file does
|
||||
- Hash of core.excludesFile. A null hash means the file does
|
||||
not exist.
|
||||
|
||||
- NUL-terminated string of per-dir exclude file name. This usually
|
||||
|
|
Loading…
Reference in a new issue