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 1530255567dc31036b4f06c9a1737bfcfee2ac59..f1bc0f2d8cea321277d2a7d2869e56f18b1fd862 100644 (file)
--- 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 f5ae5e3a8c8d9d7dcbd840cec0c353fc81e862c0..731c28998f4d2ec6a2339b40a8380c97394b220e 100644 (file)
--- 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