diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-16 05:51:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-16 05:51:53 +0300 |
| commit | 3900254bf29e00ad72de7a5b8e354369b2b84245 (patch) | |
| tree | 9229761fc4f8b7a99d364045dc78ff010ba8df89 /builtin | |
| parent | db3b1d5843354e2caf3c026b06834df7a55dcef6 (diff) | |
| parent | 93fdf301de0daa57fd6a694ad4637ec7a3a1041c (diff) | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 1d805f5da8..9028bfacf8 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1263,6 +1263,10 @@ static int parse_status_slot(const char *slot) return WT_STATUS_NOBRANCH; if (!strcasecmp(slot, "unmerged")) return WT_STATUS_UNMERGED; + if (!strcasecmp(slot, "localBranch")) + return WT_STATUS_LOCAL_BRANCH; + if (!strcasecmp(slot, "remoteBranch")) + return WT_STATUS_REMOTE_BRANCH; return -1; } |