From: Doug Kelly Date: Fri, 26 Dec 2014 23:11:46 GMT Subject: [PATCH 2/2] format-patch: ignore diff.submodule setting Message-ID: <1419635506-5045-3-git-send-email-dougk.ff7@gmail.com> In-Reply-To: <1419635506-5045-1-git-send-email-dougk.ff7@gmail.com> diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output. Signed-off-by: Doug Kelly --- builtin/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/log.c b/builtin/log.c index 734aab3..cb14db4 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")) { -- 2.0.5