[PATCH] config,completion: add color.status.unmerged
Reported-by: "Mladen B." <mladen074@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
Documentation/config.txt | 6 ++++--
contrib/completion/git-completion.bash | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a158e7f..bc22eee 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -958,9 +958,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 c21190d..e310f31 100644
--- 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
--
2.3.2.346.gb6960c9
Michael J Gruber <git@drmicha.warpmail.net>