]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'mh/show-branch-color'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 15:59:48 +0000 (08:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 May 2009 15:59:48 +0000 (08:59 -0700)
commit96825a805419628c35f9fea70997aa749dbb2750
tree86e53f950158a442f082ad61d0ba755ace49cfec
parent7f1eaec7f477fb3e81b9c5489d9ecf9bbefe0b8c
parent6123d7196fdd9ac9aed24b4aeed854813fe9a6b1
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
Documentation/config.txt
Documentation/git-show-branch.txt
builtin-show-branch.c
contrib/completion/git-completion.bash