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

1  2 
contrib/completion/git-completion.bash
Simple merge