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

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc t/t7508-status.sh
Simple merge

diff --cc wt-status.c
Simple merge