diff options
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 04e2a71687..1779625297 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -957,9 +957,11 @@ color.status.<slot>:: `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), `untracked` (files which are not tracked by Git), - `branch` (the current branch), or + `branch` (the current branch), `nobranch` (the color the 'no branch' warning is shown in, defaulting - to red). The values of these variables may be specified as in + to red), or + `unmerged` (files which have unmerged changes). + The values of these variables may be specified as in color.branch.<slot>. color.ui:: |