summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2015-03-10 17:11:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-10 15:27:59 -0700
commit0d6accc01d4073d685ece5ba9fd0a439539a5a02 (patch)
tree08a9a783a6869fd6c0f4698c015edb2cc497dd71 /contrib
parentGit 2.3 (diff)
downloadtgif-0d6accc01d4073d685ece5ba9fd0a439539a5a02.tar.xz
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>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8cfee95f88..1e8965b828 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