# Missing slot "unmerged"

2 messages from 2015-03-10 to 2015-03-10. Participants: Mladen B., Michael J Gruber.
Thread: https://gitlist.dev/t/38773

## Mladen B., 2015-03-10 12:44

Subject: Missing slot "unmerged"
Message-ID: <CAKHLQpFPJS2rp-QswBSmO72yx253LZC-LTZCimk+f+un0tAWZg@mail.gmail.com>
URL: https://gitlist.dev/e/CAKHLQpFPJS2rp-QswBSmO72yx253LZC-LTZCimk%2Bf%2Bun0tAWZg%40mail.gmail.com

```
Hi,

I noticed there is a missing <slot> named "unmerged" inside the
"color.status.<slot>" on the documentation page:
http://git-scm.com/docs/git-config

This color is used when "git status" command is performed during the
conflict in the rebase process.

M.

```

## Michael J Gruber, 2015-03-10 16:11

Subject: [PATCH] config,completion: add color.status.unmerged
Message-ID: <1e27ed382c4dc09ee5993b828c16b89e34d1cdf4.1426003811.git.git@drmicha.warpmail.net>
URL: https://gitlist.dev/e/1e27ed382c4dc09ee5993b828c16b89e34d1cdf4.1426003811.git.git%40drmicha.warpmail.net
In-Reply-To: <CAKHLQpFPJS2rp-QswBSmO72yx253LZC-LTZCimk+f+un0tAWZg@mail.gmail.com>

```
Reported-by: "Mladen B." <mladen074@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 Documentation/config.txt               | 6 ++++--
 contrib/completion/git-completion.bash | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a158e7f..bc22eee 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -958,9 +958,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::
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c21190d..e310f31 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2014,6 +2014,7 @@ _git_config ()
 		color.status.changed
 		color.status.header
 		color.status.nobranch
+		color.status.unmerged
 		color.status.untracked
 		color.status.updated
 		color.ui
-- 
2.3.2.346.gb6960c9

```