config,completion: add color.status.unmerged

Reported-by: "Mladen B." <mladen074@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04e2a71687922bbf78a493df6ca6dc5730359eb1..17796252974c51ea91672ab246ebede613ebe676 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -957,9 +957,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),
        `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
        `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::
        color.branch.<slot>.
 
 color.ui::

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.changed
                color.status.header
                color.status.nobranch

+               color.status.unmerged

                color.status.untracked
                color.status.updated
                color.ui
                color.status.untracked
                color.status.updated
                color.ui