summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-23 18:23:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-23 18:23:31 (GMT)
commitffac6258de4f72e06b6b2e412deffb00a1abb339 (patch)
treeecd845244f27808535b8d0d062379d03874b2e03 /Documentation
parent3f6f5c9dbe764c5100e6b48a0081b022983f49e8 (diff)
parent0d6accc01d4073d685ece5ba9fd0a439539a5a02 (diff)
downloadgit-ffac6258de4f72e06b6b2e412deffb00a1abb339.zip
git-ffac6258de4f72e06b6b2e412deffb00a1abb339.tar.gz
git-ffac6258de4f72e06b6b2e412deffb00a1abb339.tar.bz2
Merge branch 'mg/doc-status-color-slot' into maint
Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index efc7e68..1a8ddb4 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