Merge branch 'aa/status-hilite-branch' into next

* aa/status-hilite-branch:
  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