diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:47 -0800 |
| commit | a616162909ae756c36cef17cea7466c3f500caec (patch) | |
| tree | 34f9396e52264c05188aad352cc24d2d6039faee /notes-cache.c | |
| parent | Merge branch 'jk/rev-parse-symbolic-parents-fix' (diff) | |
| parent | submodules: allow empty working-tree dirs in merge/cherry-pick (diff) | |
| download | tgif-a616162909ae756c36cef17cea7466c3f500caec.tar.xz | |
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
Diffstat (limited to 'notes-cache.c')
0 files changed, 0 insertions, 0 deletions