From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Feb 2015 06:10:15 +0000 (-0800)
Subject: Merge branch 'dk/format-patch-ignore-diff-submodule' into maint
X-Git-Tag: v2.3.1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66061294915065375c7eaa4e3a72e4834590f32b;p=thirdparty%2Fgit.git

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

66061294915065375c7eaa4e3a72e4834590f32b