summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-16 12:50:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-16 12:50:03 -0800
commitf68b780b2575628eca75e9502e4997f98ad2af3b (patch)
tree885194f0e88689e63ad9aa154485f795f1dc0ba3 /Documentation/config.txt
parentMerge branch 'ak/describe-exact' (diff)
parentdefault color.status.branch to "same as header" (diff)
downloadtgif-f68b780b2575628eca75e9502e4997f98ad2af3b.tar.xz
Merge branch 'aa/status-hilite-branch'
* aa/status-hilite-branch: default color.status.branch to "same as header" status: show branchname with a configurable color
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3f01bd929f..488a27cd03 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -790,7 +790,8 @@ color.status.<slot>::
one of `header` (the header text of the status message),
`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), or
+ `untracked` (files which are not tracked by git),
+ `branch` (the current branch), or
`nobranch` (the color the 'no branch' warning is shown in, defaulting
to red). The values of these variables may be specified as in
color.branch.<slot>.