Merge branch 'ax/line-log-range-merge-fix'

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 1fae4eeee3b255178f075b5ad4fa848d8cd8f73f..092f1bcf9f89f124a2d3c80eadeab5b4a63db941 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::