Merge branch 'aa/status-hilite-branch'
commitf68b780b2575628eca75e9502e4997f98ad2af3b
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:50:03 +0000 (16 12:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:50:03 +0000 (16 12:50 -0800)
tree885194f0e88689e63ad9aa154485f795f1dc0ba3
parentb932c3c1c16844af9af2b71790caaca30546e99e
parent148135fc24dce1e61cfd7fcedea4210095099e78
Merge branch 'aa/status-hilite-branch'

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