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

Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged
git-mirror · Mar 23, 2015 · ffac625 · ffac625
2 parents 3f6f5c9 + 0d6accc
commit ffac625
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -983,9 +983,10 @@ 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).
+	to red), or
+	`unmerged` (files which have unmerged changes).
 
 color.ui::
 	This variable determines the default value for variables such

diff --git 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