From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2015 21:41:51 +0000 (-0800)
Subject: Merge branch 'dk/format-patch-ignore-diff-submodule'
X-Git-Tag: v2.4.0-rc0~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/35d28f32e6492eb447bd271f40a5f0d53de4c46b

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
---

35d28f32e6492eb447bd271f40a5f0d53de4c46b