diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:57 -0700 |
| commit | 2d646e3e1fd0ae7f525034abee73d06ac8946729 (patch) | |
| tree | f3be44131af79184a4c5647c9b41ddd915d86a8f /builtin/merge-tree.c | |
| parent | Merge branch 'rs/misc-cppcheck-fixes' (diff) | |
| parent | ls-files: fix path used when recursing into submodules (diff) | |
| download | tgif-2d646e3e1fd0ae7f525034abee73d06ac8946729.tar.xz | |
Merge branch 'jk/ls-files-recurse-submodules-fix'
"ls-files --recurse-submodules" did not quite work well in a
project with nested submodules.
* jk/ls-files-recurse-submodules-fix:
ls-files: fix path used when recursing into submodules
ls-files: fix recurse-submodules with nested submodules
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions