diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-07 10:43:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-07 10:43:47 +0300 |
| commit | ca7325621a1792463fdd3bd40a4e5dc766115ad7 (patch) | |
| tree | c0a2e352263732671ada2af5396c30981f956d7b /Documentation | |
| parent | 9539a56e23d29655ed0388fe6ad148139f771265 (diff) | |
| parent | 69243c2b956d69636ae04c184bc8063a6fab728a (diff) | |
Merge branch 'jc/addi-color'
* jc/addi-color:
config --get-colorbool: diff.color is a deprecated synonym to color.diff
Color support for "git-add -i"
git config --get-colorbool
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 12 | ||||
| -rw-r--r-- | Documentation/git-config.txt | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0e45ec547c..736fcd71cc 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -391,6 +391,18 @@ color.diff.<slot>:: whitespace). The values of these variables may be specified as in color.branch.<slot>. +color.interactive:: + When set to `always`, always use colors in `git add --interactive`. + When false (or `never`), never. When set to `true` or `auto`, use + colors only when the output is to the terminal. Defaults to false. + +color.interactive.<slot>:: + Use customized color for `git add --interactive` + output. `<slot>` may be `prompt`, `header`, or `help`, for + three distinct types of normal output from interactive + programs. The values of these variables may be specified as + in color.branch.<slot>. + color.pager:: A boolean to enable/disable colored output when the pager is in use (default is true). diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 7640450787..98509b4f44 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -21,6 +21,7 @@ SYNOPSIS 'git-config' [<file-option>] --remove-section name 'git-config' [<file-option>] [-z|--null] -l | --list 'git-config' [<file-option>] --get-color name [default] +'git-config' [<file-option>] --get-colorbool name [stdout-is-tty] DESCRIPTION ----------- @@ -135,6 +136,15 @@ See also <<FILES>>. output without getting confused e.g. by values that contain line breaks. +--get-colorbool name [stdout-is-tty]:: + + Find the color setting for `name` (e.g. `color.diff`) and output + "true" or "false". `stdout-is-tty` should be either "true" or + "false", and is taken into account when configuration says + "auto". If `stdout-is-tty` is missing, then checks the standard + output of the command itself, and exits with status 0 if color + is to be used, or exits with status 1 otherwise. + --get-color name default:: Find the color configured for `name` (e.g. `color.diff.new`) and |