From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 May 2017 02:51:53 +0000 (+0900)
Subject: Merge branch 'sk/status-short-branch-color-config'
X-Git-Tag: v2.14.0-rc0~192
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3900254bf29e00ad72de7a5b8e354369b2b84245;p=thirdparty%2Fgit.git

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
---

3900254bf29e00ad72de7a5b8e354369b2b84245