Merge branch 'maint'

* maint: docs: clarify "branch -l"
git-mirror · Apr 9, 2010 · dcc30eb · dcc30eb
2 parents 02125bc + 4c35f0d
commit dcc30eb
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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::