aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-02 22:49:58 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-02 22:49:58 -0800
commitcd390763d487c140570ced10ac0d955908072fc6 (patch)
tree5e4ecc6f57c830646af9ca482c35fbe1f82d4d6a /Documentation
parentee0d7946400fe773e453ab6ad8b94ae87315be69 (diff)
parent9ce0352258a421b654b5db145a42d07cbaef416c (diff)
downloadgit-cd390763d487c140570ced10ac0d955908072fc6.tar.gz
git-cd390763d487c140570ced10ac0d955908072fc6.tar.xz
Merge branch 'jc/color'
* jc/color: git-config --get-color: get configured color "color.diff = true" is not "always" anymore.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-config.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index a592b61e2..764045078 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -20,6 +20,7 @@ SYNOPSIS
'git-config' [<file-option>] --rename-section old_name new_name
'git-config' [<file-option>] --remove-section name
'git-config' [<file-option>] [-z|--null] -l | --list
+'git-config' [<file-option>] --get-color name [default]
DESCRIPTION
-----------
@@ -134,6 +135,12 @@ See also <<FILES>>.
output without getting confused e.g. by values that
contain line breaks.
+--get-color name default::
+
+ Find the color configured for `name` (e.g. `color.diff.new`) and
+ output it as the ANSI color escape sequence to the standard
+ output. The optional `default` parameter is used instead, if
+ there is no color configured for `name`.
[[FILES]]
FILES
@@ -292,6 +299,15 @@ To add a new proxy, without altering any of the existing ones, use
% git config core.gitproxy '"proxy-command" for example.com'
------------
+An example to use customized color from the configuration in your
+script:
+
+------------
+#!/bin/sh
+WS=$(git config --get-color color.diff.whitespace "blue reverse")
+RESET=$(git config --get-color "" "reset")
+echo "${WS}your whitespace color or blue reverse${RESET}"
+------------
include::config.txt[]