From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:19:12 +0000 (+0900)
Subject: Merge branch 'ks/doc-use-camelcase-for-config-name' into maint
X-Git-Tag: v2.15.0-rc2~5^2~16
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/7f607f6bfb0494a91996bd613ba689814f7da28e?hp=e1a05be9d0c790a929ae39839ec0b2a742856e02

Merge branch 'ks/doc-use-camelcase-for-config-name' into maint

Doc update.

* ks/doc-use-camelcase-for-config-name:
doc: camelCase the config variables to improve readability
---

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d0b3358771..7463dc44a7 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -92,10 +92,10 @@ OPTIONS
 	all changes made to the branch ref, enabling use of date
 	based sha1 expressions such as "<branchname>@\{yesterday}".
 	Note that in non-bare repositories, reflogs are usually
-	enabled by default by the `core.logallrefupdates` config option.
+	enabled by default by the `core.logAllRefUpdates` config option.
 	The negated form `--no-create-reflog` only overrides an earlier
 	`--create-reflog`, but currently does not negate the setting of
-	`core.logallrefupdates`.
+	`core.logAllRefUpdates`.
 
 -f::
 --force::
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 543fb425ee..95e9f391d8 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -174,7 +174,7 @@ This option is only applicable when listing tags without annotation lines.
 	`core.logAllRefUpdates` in linkgit:git-config[1].
 	The negated form `--no-create-reflog` only overrides an earlier
 	`--create-reflog`, but currently does not negate the setting of
-	`core.logallrefupdates`.
+	`core.logAllRefUpdates`.
 
 <tagname>::
 	The name of the tag to create, delete, or describe.