diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-05-16 13:30:56 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-16 13:30:56 +0900 |
commit | d5176901f5976e3785f89ec1db1081d43ddfe110 (patch) | |
tree | 17fd99897d6726d424cedd1166a8301b77b34bbc /config.txt | |
parent | 919d24f4f64cc04a733a4e52066053944d3992b4 (diff) | |
download | git-htmldocs-d5176901f5976e3785f89ec1db1081d43ddfe110.tar.gz |
Autogenerated HTML docs for v2.13.0-67-g10c78
Diffstat (limited to 'config.txt')
-rw-r--r-- | config.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config.txt b/config.txt index 475e874d5..96e9cf8b7 100644 --- a/config.txt +++ b/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:: |