summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-23 11:23:30 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-23 11:23:31 -0700
commitffac6258de4f72e06b6b2e412deffb00a1abb339 (patch)
treeecd845244f27808535b8d0d062379d03874b2e03
parent3f6f5c9dbe764c5100e6b48a0081b022983f49e8 (diff)
parent0d6accc01d4073d685ece5ba9fd0a439539a5a02 (diff)
downloadgit-ffac6258de4f72e06b6b2e412deffb00a1abb339.tar.gz
Merge branch 'mg/doc-status-color-slot' into maint
Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged
-rw-r--r--Documentation/config.txt5
-rw-r--r--contrib/completion/git-completion.bash1
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index efc7e68278..1a8ddb41c7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -983,9 +983,10 @@ 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).
+ to red), or
+ `unmerged` (files which have unmerged changes).
color.ui::
This variable determines the default value for variables such
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