diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-03-20 21:29:36 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 21:29:36 +0300 |
commit | f1aa782a3b72a2c4de46dc93b484eb99dc01d4d0 (patch) | |
tree | 7f668cd8acbb2b897c71125d55ac64cac5a7b529 /Documentation/config.txt | |
parent | d7173d942ea897b67ac9ba3bab2a0cc374684ca6 (diff) | |
parent | 00588bb5cd4a7ff5e2b1ded97d4459bfe6aad6eb (diff) |
Merge branch 'ml/color-grep'
* ml/color-grep:
grep: Colorize selected, context, and function lines
grep: Colorize filename, line number, and separator
Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 805e0511ff..1dbded0fdc 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -690,9 +690,29 @@ color.grep:: `never`), never. When set to `true` or `auto`, use color only when the output is written to the terminal. Defaults to `false`. -color.grep.match:: - Use customized color for matches. The value of this variable - may be specified as in color.branch.<slot>. +color.grep.<slot>:: + Use customized color for grep colorization. `<slot>` specifies which + part of the line to use the specified color, and is one of ++ +-- +`context`;; + non-matching text in context lines (when using `-A`, `-B`, or `-C`) +`filename`;; + filename prefix (when not using `-h`) +`function`;; + function name lines (when using `-p`) +`linenumber`;; + line number prefix (when using `-n`) +`match`;; + matching text +`selected`;; + non-matching text in selected lines +`separator`;; + separators between fields on a line (`:`, `-`, and `=`) + and between hunks (`--`) +-- ++ +The values of these variables may be specified as in color.branch.<slot>. color.interactive:: When set to `always`, always use colors for interactive prompts |