Merge branch 'bc/rev-parse-parseopt-fix'

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index e292737b9c5ab65d53ed3caf2e553a7e7e098fb5..58f1e5c9c74e187449d6721b4d4322e9cb4733eb 100644 (file)
--- 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::