diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-04 21:39:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-04 21:39:48 +0900 |
| commit | f635b8d17b673ffb96c0f10d11751500e1892b2a (patch) | |
| tree | 41d2a0f42dfa5a060d96a12194efc49ced331633 /t/t4134-apply-submodule.sh | |
| parent | A bit more topics before -rc1 (diff) | |
| parent | submodule: do not pass null OID to setup_revisions (diff) | |
| download | tgif-f635b8d17b673ffb96c0f10d11751500e1892b2a.tar.xz | |
Merge branch 'jt/submodule-pull-recurse-rebase'
"git pull -recurse-submodules --rebase", when the submodule
repository's history did not have anything common between ours and
the upstream's, failed to execute. We need to fetch from them to
continue even in such a case.
* jt/submodule-pull-recurse-rebase:
submodule: do not pass null OID to setup_revisions
Diffstat (limited to 't/t4134-apply-submodule.sh')
0 files changed, 0 insertions, 0 deletions