summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2015-03-10 16:11:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-10 22:27:59 (GMT)
commit0d6accc01d4073d685ece5ba9fd0a439539a5a02 (patch)
tree08a9a783a6869fd6c0f4698c015edb2cc497dd71 /Documentation
parent9874fca7122563e28d699a911404fc49d2a24f1c (diff)
downloadgit-0d6accc01d4073d685ece5ba9fd0a439539a5a02.zip
git-0d6accc01d4073d685ece5ba9fd0a439539a5a02.tar.gz
git-0d6accc01d4073d685ece5ba9fd0a439539a5a02.tar.bz2
config,completion: add color.status.unmerged
Reported-by: "Mladen B." <mladen074@gmail.com> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04e2a71..1779625 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::