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.lorimer.id.au/gitweb.git/diff_plain/96825a805419628c35f9fea70997aa749dbb2750?hp=96825a805419628c35f9fea70997aa749dbb2750

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
---