| commit | 66061294915065375c7eaa4e3a72e4834590f32b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Feb 2015 06:10:15 +0000 (24 22:10 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Feb 2015 06:10:15 +0000 (24 22:10 -0800) | ||
| tree | fcce242460d89cb2475de486d48a01d18d36e758 | treesnapshot (tar.gz zip) |
| parent | 74419c29df3f5c6b25bf0208222ddbf76b37acda | commitdiff |
| parent | 339de5089115b6d8d85c73c1b8d2aa281e9625d2 | commitdiff |
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
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 | blobhistory |