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

Documentation fixes.

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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index efc7e68278a2ae32fa0ebf1efe3bad78fc238743..1a8ddb41c7fff8cce5d2c0a51a9d642e3bf0fd42 100644 (file)
--- 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
index 8cfee95f88006269e4227f98701b9af8587af0bd..1e8965b828b19efa501c5631b364cd0187697759 100644 (file)
--- 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