mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/doc-config-camelcase'

Browse Source 
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:
Junio C Hamano
2021-02-25 16:43:32 -08:00
parent 1c8f5dfa42 7dd0eaa39c
commit 09e72204f8
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/blame-options.txt
View File

@ -1,6 +1,6 @@
-b:: -b::
Show blank SHA-1 for boundary commits. This can also 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:: --root::
Do not treat root commits as boundaries. This can also be Do not treat root commits as boundaries. This can also be

2
Documentation/git-am.txt
View File

@ -79,7 +79,7 @@ OPTIONS
Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
The proposed commit log message taken from the e-mail The proposed commit log message taken from the e-mail
is re-coded into UTF-8 encoding (configuration variable 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). preferred encoding if it is not UTF-8).
+ +
This was optional in prior versions of git, but now it is the This was optional in prior versions of git, but now it is the

4
Documentation/git-mailinfo.txt
View File

@ -53,7 +53,7 @@ character.
The commit log message, author name and author email are The commit log message, author name and author email are
taken from the e-mail, and after minimally decoding MIME taken from the e-mail, and after minimally decoding MIME
transfer encoding, re-coded in the charset specified by 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. them. This used to be optional but now it is the default.
+ +
Note that the patch is always used as-is without charset Note that the patch is always used as-is without charset
@ -61,7 +61,7 @@ conversion, even with this flag.
--encoding=<encoding>:: --encoding=<encoding>::
Similar to -u. But when re-coding, the charset specified here is 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:: -n::
Disable all charset re-coding of the metadata. Disable all charset re-coding of the metadata.

2
Documentation/i18n.txt
View File

@ -38,7 +38,7 @@ mind.
a warning if the commit log message given to it does not look a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to 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] [i18n]

4
Documentation/technical/index-format.txt
View File

@ -273,14 +273,14 @@ Git index format
- Stat data of $GIT_DIR/info/exclude. See "Index entry" section from - Stat data of $GIT_DIR/info/exclude. See "Index entry" section from
ctime field until "file size". ctime field until "file size".
- Stat data of core.excludesfile - Stat data of core.excludesFile
- 32-bit dir_flags (see struct dir_struct) - 32-bit dir_flags (see struct dir_struct)
- Hash of $GIT_DIR/info/exclude. A null hash means the file - Hash of $GIT_DIR/info/exclude. A null hash means the file
does not exist. 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. not exist.
- NUL-terminated string of per-dir exclude file name. This usually - NUL-terminated string of per-dir exclude file name. This usually