]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b0490f 5423d2e)
Merge branch 'dt/empty-submodule-in-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:26 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:26 +0000 (14:49 -0800)
commit0f47d3d78ee2fc4c81950eeaf2c9a11b1a81bcad
tree6f47496b52479514fdef4b19163ec0ef7df99347tree | snapshot
parent7b0490f81c7c9ce5a93f92ddd3bf7cae78a073e8commit | diff
parent5423d2e7005eca89481d3137569b2b96b4d133ffcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.