summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-28 05:47:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-28 05:47:56 (GMT)
commit47d26f0a66de017d7516e3414517eb5898f3723f (patch)
treebd4fd8d9a82e5a614e369922f36515393f4c7db9
parentfdbe2ac1983c1224ce40b465b22e44d7e22de6c4 (diff)
parentc3342b362e77ad22b751e00fee00f96ea6ff0884 (diff)
downloadgit-47d26f0a66de017d7516e3414517eb5898f3723f.zip
git-47d26f0a66de017d7516e3414517eb5898f3723f.tar.gz
git-47d26f0a66de017d7516e3414517eb5898f3723f.tar.bz2
Merge branch 'ks/doc-use-camelcase-for-config-name'
Doc update. * ks/doc-use-camelcase-for-config-name: doc: camelCase the config variables to improve readability
-rw-r--r--Documentation/git-branch.txt4
-rw-r--r--Documentation/git-tag.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index e292737..58f1e5c 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 543fb42..95e9f39 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.