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>
Michael J Gruber committed
Mar 10, 2015 at 17:11 UTC
0d6accc01d4073d685ece5ba9fd0a439539a5a02
2 files changed
+5
-2
Documentation/config.txt
+4
-2
@@ -957,9 +957,11 @@ color.status.<slot>::
957
`added` or `updated` (files which are added but not committed),
958
`changed` (files which are changed but not added in the index),
959
`untracked` (files which are not tracked by Git),
960
- `branch` (the current branch), or
960
+ `branch` (the current branch),
961
`nobranch` (the color the 'no branch' warning is shown in, defaulting
962
- to red). The values of these variables may be specified as in
962
+ to red), or
963
+ `unmerged` (files which have unmerged changes).
964
+ The values of these variables may be specified as in
965
color.branch.<slot>.
966
967
color.ui::
contrib/completion/git-completion.bash
+1
@@ -2014,6 +2014,7 @@ _git_config ()
2014
color.status.changed
2015
color.status.header
2016
color.status.nobranch
2017
+ color.status.unmerged
2018
color.status.untracked
2019
color.status.updated
2020
color.ui