diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-13 12:50:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-13 12:50:44 -0700 |
| commit | fb6ac9e79ae47aa55bb1c8b151afa770abd2a601 (patch) | |
| tree | 315da2150b746c83a648741bf87c915194e5292c /merge-recursive.c | |
| parent | RelNotes 2.18: clarify where directory rename detection applies (diff) | |
| parent | fsck: avoid looking at NULL blob->object (diff) | |
| download | tgif-fb6ac9e79ae47aa55bb1c8b151afa770abd2a601.tar.xz | |
Merge branch 'jk/submodule-fsck-loose-fixup'
Finishing touches to a topic that already is in 'maint'.
* jk/submodule-fsck-loose-fixup:
fsck: avoid looking at NULL blob->object
t7415: don't bother creating commit for symlink test
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions