diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-17 16:01:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-17 16:01:34 -0700 |
| commit | 2a39bdb9a163f9f4ad11599dbeca87445eecb7d8 (patch) | |
| tree | 4b76762cbff4f9da95da827c6229a89574d80004 | |
| parent | Merge branch 'mg/status-v-v' (diff) | |
| parent | config,completion: add color.status.unmerged (diff) | |
| download | tgif-2a39bdb9a163f9f4ad11599dbeca87445eecb7d8.tar.xz | |
Merge branch 'mg/doc-status-color-slot'
Documentation fixes.
* mg/doc-status-color-slot:
config,completion: add color.status.unmerged
| -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 1530255567..f1bc0f2d8c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -956,9 +956,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 f5ae5e3a8c..731c28998f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2011,6 +2011,7 @@ _git_config () color.status.changed color.status.header color.status.nobranch + color.status.unmerged color.status.untracked color.status.updated color.ui |