diff options
| author | Stephen Kent <smkent@smkent.net> | 2017-04-21 22:42:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-28 11:50:52 +0900 |
| commit | 93fdf301de0daa57fd6a694ad4637ec7a3a1041c (patch) | |
| tree | 0dd9a364d094cbfb01a7edff145169fc7c41d3d3 /Documentation | |
| parent | 75177c8591aee23374c2ead9c9505ce989a8eec2 (diff) | |
| download | git-93fdf301de0daa57fd6a694ad4637ec7a3a1041c.tar.gz git-93fdf301de0daa57fd6a694ad4637ec7a3a1041c.tar.xz | |
status: add color config slots for branch info in "--short --branch"
Add color config slots to be used in the status short-format when
displaying local and remote tracking branch information.
[jc: rebased on top of Peff's fix to 'git status' and tweaked the
test to check both local and remote-tracking branch output]
Signed-off-by: Stephen Kent <smkent@smkent.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 475e874d5..96e9cf8b7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1137,7 +1137,10 @@ color.status.<slot>:: `untracked` (files which are not tracked by Git), `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting - to red), or + to red), + `localBranch` or `remoteBranch` (the local and remote branch names, + respectively, when branch and tracking information is displayed in the + status short-format), or `unmerged` (files which have unmerged changes). color.ui:: |