diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-16 11:51:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-16 11:51:53 +0900 |
| commit | 3900254bf29e00ad72de7a5b8e354369b2b84245 (patch) | |
| tree | 9229761fc4f8b7a99d364045dc78ff010ba8df89 /Documentation | |
| parent | db3b1d5843354e2caf3c026b06834df7a55dcef6 (diff) | |
| parent | 93fdf301de0daa57fd6a694ad4637ec7a3a1041c (diff) | |
| download | git-3900254bf29e00ad72de7a5b8e354369b2b84245.tar.gz git-3900254bf29e00ad72de7a5b8e354369b2b84245.tar.xz | |
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 '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:: |