Merge branch 'maint'

* maint:
docs: clarify "branch -l"

diff --combined Documentation/git-branch.txt
index 903a690f10e3cdb7aea15a19332bf0e8bc87814e,b3605c0ec560025e2b53286e4f69bc75c894140b..d78f4c7398be1e7a403fcc34a9587dfee651b72d
--- 1/Documentation/git-branch.txt
--- 2/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -8,7 -8,7 +8,7 @@@ git-branch - List, create, or delete br
  SYNOPSIS
  --------
  [verse]
 -'git branch' [--color | --no-color] [-r | -a]
 +'git branch' [--color[=<when>] | --no-color] [-r | -a]
        [-v [--abbrev=<length> | --no-abbrev]]
        [(--merged | --no-merged | --contains) [<commit>]]
  'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
@@@ -72,6 -72,8 +72,8 @@@ OPTION
        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::
@@@ -84,14 -86,12 +86,14 @@@
  -M::
        Move/rename a branch even if the new branch name already exists.
  
 ---color::
 +--color[=<when>]::
        Color branches to highlight current, local, and remote branches.
 +      The value must be always (the default), never, or auto.
  
  --no-color::
        Turn off branch colors, even when the configuration file gives the
        default to color output.
 +      Same as `--color=never`.
  
  -r::
        List or delete (if used with -d) the remote-tracking branches.