diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:10:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:10:15 -0800 |
| commit | 66061294915065375c7eaa4e3a72e4834590f32b (patch) | |
| tree | fcce242460d89cb2475de486d48a01d18d36e758 /lockfile.h | |
| parent | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint (diff) | |
| parent | format-patch: ignore diff.submodule setting (diff) | |
| download | tgif-66061294915065375c7eaa4e3a72e4834590f32b.tar.xz | |
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
Diffstat (limited to 'lockfile.h')
0 files changed, 0 insertions, 0 deletions