diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:40 -0700 |
| commit | 2927a507bf8080661ed84000ce55465941bd28a9 (patch) | |
| tree | 6abfc037ab5ff89d614674f9283432756dc704da /builtin/log.c | |
| parent | Merge branch 'mg/doc-rev-parse-treepath-syntax' (diff) | |
| parent | Add test for correct coloring of git log --decoration (diff) | |
| download | tgif-2927a507bf8080661ed84000ce55465941bd28a9.tar.xz | |
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 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index 7cb9317af7..08b872263c 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -296,6 +296,9 @@ static int git_log_config(const char *var, const char *value, void *cb) default_show_root = git_config_bool(var, value); return 0; } + if (!prefixcmp(var, "color.decorate.")) + return parse_decorate_color_config(var, 15, value); + return git_diff_ui_config(var, value, cb); } |