diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-14 21:43:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-14 21:43:57 -0700 |
| commit | 559357b508847df5a5736ed7130f6bccab52d044 (patch) | |
| tree | 49b5175355e95ccc029e759e2f59171fd9ab475e /builtin/log.c | |
| parent | git-svn: teach git-svn to populate svn:mergeinfo (diff) | |
| parent | format-patch: ignore ui.color (diff) | |
| download | tgif-559357b508847df5a5736ed7130f6bccab52d044.tar.xz | |
Merge branch 'ph/format-patch-no-color'
* ph/format-patch-no-color:
format-patch: ignore ui.color
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index d760ee0885..f5d4930590 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -608,7 +608,8 @@ static int git_format_config(const char *var, const char *value, void *cb) string_list_append(&extra_cc, value); return 0; } - if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) { + if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") || + !strcmp(var, "color.ui")) { return 0; } if (!strcmp(var, "format.numbered")) { |