Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively'

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 5516a47b5490ff1e79ead61cd2229946cc1a7fe2..28d46cc03b217c156769f6123c7b3e3351eabce4 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -91,6 +91,9 @@ OPTIONS
        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.
+       The negated form `--no-create-reflog` only overrides an earlier
+       `--create-reflog`, but currently does not negate the setting of
+       `core.logallrefupdates`.
 
 -f::
 --force::