diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-25 06:10:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-25 06:10:15 (GMT) |
| commit | 66061294915065375c7eaa4e3a72e4834590f32b (patch) | |
| tree | fcce242460d89cb2475de486d48a01d18d36e758 /builtin | |
| parent | 74419c29df3f5c6b25bf0208222ddbf76b37acda (diff) | |
| parent | 339de5089115b6d8d85c73c1b8d2aa281e9625d2 (diff) | |
| download | git-66061294915065375c7eaa4e3a72e4834590f32b.zip git-66061294915065375c7eaa4e3a72e4834590f32b.tar.gz git-66061294915065375c7eaa4e3a72e4834590f32b.tar.bz2 | |
Merge branch 'dk/format-patch-ignore-diff-submodule' into maint
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 923ffe7..a131992 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")) { |