Merge branch 'mg/status-b'

* mg/status-b:
  Documentation+t5708: document and test status -s -b
  Show branch information in short output of git status

diff --cc builtin/commit.c
Simple merge