Merge branch 'sk/status-short-branch-color-config'
commit3900254bf29e00ad72de7a5b8e354369b2b84245
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:53 +0000 (16 11:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:53 +0000 (16 11:51 +0900)
tree9229761fc4f8b7a99d364045dc78ff010ba8df89
parentdb3b1d5843354e2caf3c026b06834df7a55dcef6
parent93fdf301de0daa57fd6a694ad4637ec7a3a1041c
Merge branch 'sk/status-short-branch-color-config'

The colors in which "git status --short --branch" showed the names
of the current branch and its remote-tracking branch are now
configurable.

* sk/status-short-branch-color-config:
  status: add color config slots for branch info in "--short --branch"
  status: fix missing newline when comment chars are disabled
contrib/completion/git-completion.bash