git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74419c2 339de50)
Merge branch 'dk/format-patch-ignore-diff-submodule' into maint
authorJunio C Hamano <redacted>
Wed, 25 Feb 2015 06:10:15 +0000 (22:10 -0800)
committerJunio C Hamano <redacted>
Wed, 25 Feb 2015 06:10:15 +0000 (22:10 -0800)
commit66061294915065375c7eaa4e3a72e4834590f32b
treefcce242460d89cb2475de486d48a01d18d36e758tree | snapshot
parent74419c29df3f5c6b25bf0208222ddbf76b37acdacommit | diff
parent339de5089115b6d8d85c73c1b8d2aa281e9625d2commit | diff
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
builtin/log.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT