summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-11 21:41:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-02-11 21:41:52 (GMT)
commit35d28f32e6492eb447bd271f40a5f0d53de4c46b (patch)
treedbfaadf829ea0aa8719594c04f4c8d89a2f63f1c /builtin/log.c
parent76c6747b7e0a67416c1d88bf50440436397abd3f (diff)
parent339de5089115b6d8d85c73c1b8d2aa281e9625d2 (diff)
downloadgit-35d28f32e6492eb447bd271f40a5f0d53de4c46b.zip
git-35d28f32e6492eb447bd271f40a5f0d53de4c46b.tar.gz
git-35d28f32e6492eb447bd271f40a5f0d53de4c46b.tar.bz2
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/log.c')
-rw-r--r--builtin/log.c2
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")) {