From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 May 2009 15:59:48 +0000 (-0700)
Subject: Merge branch 'mh/show-branch-color'
X-Git-Tag: v1.6.4-rc0~160
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=96825a805419628c35f9fea70997aa749dbb2750;p=git.git

Merge branch 'mh/show-branch-color'

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

Conflicts:
	contrib/completion/git-completion.bash
---

96825a805419628c35f9fea70997aa749dbb2750
diff --cc contrib/completion/git-completion.bash
index f8d4cb2c7,b58838726..ba13c4948
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1854,7 -1678,8 +1856,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
  		;;