summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Chris Parsons <chris@edendevelopment.co.uk>2008-05-22 08:50:02 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-22 23:51:22 -0700
commit950ce2e22db4a3c1ff9ad598b46ccb22c517a336 (patch)
tree049fd11a2346c2ec1c20ce0787f8eaf6b97dce44 /Documentation
parentpull --rebase: exit early when the working directory is dirty (diff)
downloadtgif-950ce2e22db4a3c1ff9ad598b46ccb22c517a336.tar.xz
Updated status to show 'Not currently on any branch' in red
This provides additional warning to users when attempting to commit to a detached HEAD. It is configurable in color.status.nobranch. Signed-off-by: Chris Parsons <chris@edendevelopment.co.uk> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 217980f48d..554977b895 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -523,8 +523,10 @@ 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),
- or `untracked` (files which are not tracked by git). The values of
- these variables may be specified as in color.branch.<slot>.
+ `untracked` (files which are not tracked by git), 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>.
commit.template::
Specify a file to use as the template for new commit messages.