Skip to content

Commit 09e7220

Browse files
committed
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"
2 parents 1c8f5df + 7dd0eaa commit 09e7220

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Documentation/blame-options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-b::
22
Show blank SHA-1 for boundary commits. This can also
3-
be controlled via the `blame.blankboundary` config option.
3+
be controlled via the `blame.blankBoundary` config option.
44

55
--root::
66
Do not treat root commits as boundaries. This can also be

Documentation/git-am.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ OPTIONS
7979
Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
8080
The proposed commit log message taken from the e-mail
8181
is re-coded into UTF-8 encoding (configuration variable
82-
`i18n.commitencoding` can be used to specify project's
82+
`i18n.commitEncoding` can be used to specify project's
8383
preferred encoding if it is not UTF-8).
8484
+
8585
This was optional in prior versions of git, but now it is the

Documentation/git-mailinfo.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ character.
5353
The commit log message, author name and author email are
5454
taken from the e-mail, and after minimally decoding MIME
5555
transfer encoding, re-coded in the charset specified by
56-
i18n.commitencoding (defaulting to UTF-8) by transliterating
56+
`i18n.commitEncoding` (defaulting to UTF-8) by transliterating
5757
them. This used to be optional but now it is the default.
5858
+
5959
Note that the patch is always used as-is without charset
6060
conversion, even with this flag.
6161

6262
--encoding=<encoding>::
6363
Similar to -u. But when re-coding, the charset specified here is
64-
used instead of the one specified by i18n.commitencoding or UTF-8.
64+
used instead of the one specified by `i18n.commitEncoding` or UTF-8.
6565

6666
-n::
6767
Disable all charset re-coding of the metadata.

Documentation/i18n.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ mind.
3838
a warning if the commit log message given to it does not look
3939
like a valid UTF-8 string, unless you explicitly say your
4040
project uses a legacy encoding. The way to say this is to
41-
have i18n.commitencoding in `.git/config` file, like this:
41+
have `i18n.commitEncoding` in `.git/config` file, like this:
4242
+
4343
------------
4444
[i18n]

Documentation/technical/index-format.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,14 @@ Git index format
273273
- Stat data of $GIT_DIR/info/exclude. See "Index entry" section from
274274
ctime field until "file size".
275275

276-
- Stat data of core.excludesfile
276+
- Stat data of core.excludesFile
277277

278278
- 32-bit dir_flags (see struct dir_struct)
279279

280280
- Hash of $GIT_DIR/info/exclude. A null hash means the file
281281
does not exist.
282282

283-
- Hash of core.excludesfile. A null hash means the file does
283+
- Hash of core.excludesFile. A null hash means the file does
284284
not exist.
285285

286286
- NUL-terminated string of per-dir exclude file name. This usually

0 commit comments

Comments
 (0)