diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:50:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:50:03 -0800 |
| commit | f68b780b2575628eca75e9502e4997f98ad2af3b (patch) | |
| tree | 885194f0e88689e63ad9aa154485f795f1dc0ba3 /builtin | |
| parent | b932c3c1c16844af9af2b71790caaca30546e99e (diff) | |
| parent | 148135fc24dce1e61cfd7fcedea4210095099e78 (diff) | |
| download | git-f68b780b2575628eca75e9502e4997f98ad2af3b.tar.gz git-f68b780b2575628eca75e9502e4997f98ad2af3b.tar.xz | |
Merge branch 'aa/status-hilite-branch'
* aa/status-hilite-branch:
default color.status.branch to "same as header"
status: show branchname with a configurable color
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index c045c9ef8..6c09857a6 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1011,6 +1011,8 @@ static int parse_status_slot(const char *var, int offset) { if (!strcasecmp(var+offset, "header")) return WT_STATUS_HEADER; + if (!strcasecmp(var+offset, "branch")) + return WT_STATUS_ONBRANCH; if (!strcasecmp(var+offset, "updated") || !strcasecmp(var+offset, "added")) return WT_STATUS_UPDATED; |