diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:12 (GMT) |
| commit | 7f607f6bfb0494a91996bd613ba689814f7da28e (patch) | |
| tree | a0944de0daef4008790dfb981847ba203347253a /Documentation | |
| parent | e1a05be9d0c790a929ae39839ec0b2a742856e02 (diff) | |
| parent | c3342b362e77ad22b751e00fee00f96ea6ff0884 (diff) | |
| download | git-7f607f6bfb0494a91996bd613ba689814f7da28e.zip git-7f607f6bfb0494a91996bd613ba689814f7da28e.tar.gz git-7f607f6bfb0494a91996bd613ba689814f7da28e.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-branch.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-tag.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d0b3358..7463dc4 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. |