diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2015-03-10 17:11:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-10 15:27:59 -0700 |
| commit | 0d6accc01d4073d685ece5ba9fd0a439539a5a02 (patch) | |
| tree | 08a9a783a6869fd6c0f4698c015edb2cc497dd71 | |
| parent | 9874fca7122563e28d699a911404fc49d2a24f1c (diff) | |
| download | git-mg/doc-status-color-slot.tar.gz | |
config,completion: add color.status.unmergedmg/doc-status-color-slot
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>
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | contrib/completion/git-completion.bash | 1 |
2 files changed, 5 insertions, 2 deletions
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.<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 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 |