diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 18:55:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 18:55:40 (GMT) |
| commit | 2927a507bf8080661ed84000ce55465941bd28a9 (patch) | |
| tree | 6abfc037ab5ff89d614674f9283432756dc704da /Documentation/config.txt | |
| parent | 54ed6a98fda3765a6ffcac870f79528a48b4c07f (diff) | |
| parent | 567102819ac56ccf7eb638ea8b5c975c03e88558 (diff) | |
| download | git-2927a507bf8080661ed84000ce55465941bd28a9.zip git-2927a507bf8080661ed84000ce55465941bd28a9.tar.gz git-2927a507bf8080661ed84000ce55465941bd28a9.tar.bz2 | |
Merge branch 'ar/decorate-color'
* ar/decorate-color:
Add test for correct coloring of git log --decoration
Allow customizable commit decorations colors
log --decorate: Colorize commit decorations
log-tree.c: Use struct name_decoration's type for classifying decoration
commit.h: add 'type' to struct name_decoration
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4c49104..72949e7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -690,6 +690,11 @@ color.diff.<slot>:: (highlighting whitespace errors). The values of these variables may be specified as in color.branch.<slot>. +color.decorate.<slot>:: + Use customized color for 'git log --decorate' output. `<slot>` is one + of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local + branches, remote tracking branches, tags, stash and HEAD, respectively. + color.grep:: When set to `always`, always highlight matches. When `false` (or `never`), never. When set to `true` or `auto`, use color only |