diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:26 -0800 |
| commit | 0f47d3d78ee2fc4c81950eeaf2c9a11b1a81bcad (patch) | |
| tree | 6f47496b52479514fdef4b19163ec0ef7df99347 /streaming.h | |
| parent | 7b0490f81c7c9ce5a93f92ddd3bf7cae78a073e8 (diff) | |
| parent | 5423d2e7005eca89481d3137569b2b96b4d133ff (diff) | |
| download | git-0f47d3d78ee2fc4c81950eeaf2c9a11b1a81bcad.tar.gz git-0f47d3d78ee2fc4c81950eeaf2c9a11b1a81bcad.tar.xz | |
Merge branch 'dt/empty-submodule-in-merge' into maint
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
Diffstat (limited to 'streaming.h')
0 files changed, 0 insertions, 0 deletions