From: Michael J Gruber Date: Tue, 10 Mar 2015 16:11:09 +0000 (+0100) Subject: config,completion: add color.status.unmerged X-Git-Tag: v2.3.4~5^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d6accc01d4073d685ece5ba9fd0a439539a5a02;p=thirdparty%2Fgit.git config,completion: add color.status.unmerged Reported-by: "Mladen B." Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 04e2a71687..1779625297 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -957,9 +957,11 @@ color.status.:: `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.. color.ui:: 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