| commit | a616162909ae756c36cef17cea7466c3f500caec | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 16 Dec 2016 23:27:47 +0000 (16 15:27 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 16 Dec 2016 23:27:47 +0000 (16 15:27 -0800) | ||
| tree | 34f9396e52264c05188aad352cc24d2d6039faee | treesnapshot (tar.gz zip) |
| parent | 598119d3cdd59b750bd33da639cf2cc6a6675199 | commitdiff |
| parent | 5423d2e7005eca89481d3137569b2b96b4d133ff | commitdiff |
Merge branch 'dt/empty-submodule-in-merge'
An empty directory in a working tree that can simply be nuked used
to interfere while merging or cherry-picking a change to create a
submodule directory there, which has been fixed..
* dt/empty-submodule-in-merge:
submodules: allow empty working-tree dirs in merge/cherry-pick
An empty directory in a working tree that can simply be nuked used
to interfere while merging or cherry-picking a change to create a
submodule directory there, which has been fixed..
* dt/empty-submodule-in-merge:
submodules: allow empty working-tree dirs in merge/cherry-pick