| commit | 35d28f32e6492eb447bd271f40a5f0d53de4c46b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Feb 2015 21:41:51 +0000 (11 13:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Feb 2015 21:41:52 +0000 (11 13:41 -0800) | ||
| tree | dbfaadf829ea0aa8719594c04f4c8d89a2f63f1c | treesnapshot (tar.gz zip) |
| parent | 76c6747b7e0a67416c1d88bf50440436397abd3f | commitdiff |
| parent | 339de5089115b6d8d85c73c1b8d2aa281e9625d2 | commitdiff |
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
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 |