From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Mar 2015 23:01:34 +0000 (-0700)
Subject: Merge branch 'mg/doc-status-color-slot'
X-Git-Tag: v2.4.0-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a39bdb9a163f9f4ad11599dbeca87445eecb7d8?hp=9bb56e47532db6fb7e97020ffa247ad5c54b1726

Merge branch 'mg/doc-status-color-slot'

Documentation fixes.

* mg/doc-status-color-slot:
config,completion: add color.status.unmerged
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1530255567..f1bc0f2d8c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -956,9 +956,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 f5ae5e3a8c..731c28998f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2011,6 +2011,7 @@ _git_config ()
 		color.status.changed
 		color.status.header
 		color.status.nobranch
+		color.status.unmerged
 		color.status.untracked
 		color.status.updated
 		color.ui