Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 May 2009 15:55:02 +0000 (08:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 05:47:47 +0000 (22:47 -0700)
commit1ca20358e769e5bf8f3567a658efe858f8550ff5
treefbfc064fa3062fc1b9e7f8cfc2c4af90a2dd2de6
parent29f25d493c1021a53acf41e5763e732217dd75c3
parent6123d7196fdd9ac9aed24b4aeed854813fe9a6b1
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
Documentation/config.txt
Documentation/git-show-branch.txt
builtin-show-branch.c
contrib/completion/git-completion.bash