Merge branch 'aa/status-hilite-branch' into next
commit02918583ee08cb6c17580a2bf8eb7abdcacfbacf
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:29 +0000 (8 12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:29 +0000 (8 12:25 -0800)
treef3b75b568abb1b287c54d8aea6fa4c0602cee4ba
parentc92752ec50228ba52d9eff1dd2260a33b535547f
parent1d282327d7354dd3a1caefa4af06562aa816710d
Merge branch 'aa/status-hilite-branch' into next

* aa/status-hilite-branch:
  status: show branchname with a configurable color
Documentation/config.txt
builtin/commit.c
t/t7508-status.sh
wt-status.c