diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:41:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:41:52 -0800 |
| commit | 35d28f32e6492eb447bd271f40a5f0d53de4c46b (patch) | |
| tree | dbfaadf829ea0aa8719594c04f4c8d89a2f63f1c /builtin | |
| parent | Merge branch 'jn/rerere-fail-on-auto-update-failure' (diff) | |
| parent | format-patch: ignore diff.submodule setting (diff) | |
| download | tgif-35d28f32e6492eb447bd271f40a5f0d53de4c46b.tar.xz | |
Merge branch 'dk/format-patch-ignore-diff-submodule'
Setting diff.submodule to 'log' made "git format-patch" produce
broken patches.
* dk/format-patch-ignore-diff-submodule:
format-patch: ignore diff.submodule setting
t4255: test am submodule with diff.submodule
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 923ffe72ce..a131992c52 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -705,7 +705,7 @@ static int git_format_config(const char *var, const char *value, void *cb) return 0; } if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") || - !strcmp(var, "color.ui")) { + !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) { return 0; } if (!strcmp(var, "format.numbered")) { |