From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 May 2009 15:55:02 +0000 (-0700)
Subject: Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options
X-Git-Tag: v1.6.4-rc0~96^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ca20358e769e5bf8f3567a658efe858f8550ff5;p=git.git

Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options

* branch 'mh/show-branch-color':
  bash completion: show-branch color support
  show-branch: color the commit status signs
---

1ca20358e769e5bf8f3567a658efe858f8550ff5
diff --cc contrib/completion/git-completion.bash
index a0c579482,b58838726..451a97f07
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1821,7 -1678,8 +1823,8 @@@ _git_show_branch (
  		__gitcomp "
  			--all --remotes --topo-order --current --more=
  			--list --independent --merge-base --no-name
+ 			--color --no-color
 -			--sha1-name --topics --reflog
 +			--sha1-name --sparse --topics --reflog
  			"
  		return
  		;;