From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Apr 2010 06:27:23 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dcc30eb2c780f009af36f87d6c4ff484eeec5bec?hp=-c

Merge branch 'maint'

* maint:
docs: clarify "branch -l"
---

dcc30eb2c780f009af36f87d6c4ff484eeec5bec
diff --combined Documentation/git-branch.txt
index 903a690f10,b3605c0ec5..d78f4c7398
--- a/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.