From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 22:49:26 +0000 (-0800)
Subject: Merge branch 'dt/empty-submodule-in-merge' into maint
X-Git-Tag: v2.11.1~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f47d3d78ee2fc4c81950eeaf2c9a11b1a81bcad;p=thirdparty%2Fgit.git

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
---

0f47d3d78ee2fc4c81950eeaf2c9a11b1a81bcad