mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config,completion: add color.status.unmerged

Browse Source 
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>
This commit is contained in:
Michael J Gruber
2015-03-10 17:11:09 +01:00
committed by Junio C Hamano
parent 9874fca712
commit 0d6accc01d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config.txt
View File

@ -957,9 +957,11 @@ color.status.<slot>::
`added` or `updated` (files which are added but not committed), `added` or `updated` (files which are added but not committed),
`changed` (files which are changed but not added in the index), `changed` (files which are changed but not added in the index),
`untracked` (files which are not tracked by Git), `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.branch.<slot>.
color.ui:: color.ui::

1
contrib/completion/git-completion.bash
View File

@ -2014,6 +2014,7 @@ _git_config ()
color.status.changed color.status.changed
color.status.header color.status.header
color.status.nobranch color.status.nobranch
color.status.unmerged
color.status.untracked color.status.untracked
color.status.updated color.status.updated
color.ui color.ui