summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-08 23:27:23 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-08 23:27:23 -0700
commitdcc30eb2c780f009af36f87d6c4ff484eeec5bec (patch)
treefef744202f8e074a2fd469ae867de1730f69a05b /Documentation
parent02125bcc41aed022ddcb5955935726e50d89b60e (diff)
parent4c35f0dbc41a2bb79e4f597d3b7bdb265c5ea750 (diff)
downloadgit-dcc30eb2c780f009af36f87d6c4ff484eeec5bec.tar.gz
Merge branch 'maint'
* maint: docs: clarify "branch -l"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 903a690f10..d78f4c7398 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -72,6 +72,8 @@ OPTIONS
Create the branch's reflog. This activates recording of
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.
-f::
--force::