| commit | f635b8d17b673ffb96c0f10d11751500e1892b2a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Jun 2018 12:39:48 +0000 (4 21:39 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Jun 2018 12:39:48 +0000 (4 21:39 +0900) | ||
| tree | 41d2a0f42dfa5a060d96a12194efc49ced331633 | treesnapshot (tar.gz zip) |
| parent | c2c7d17b030646b40e6764ba34a5ebf66aee77af | commitdiff |
| parent | 4d36f88be7401fb4ff225557aae05a458091b24b | commitdiff |
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
"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
| submodule.c | diff1 | diff2 | blobhistory |
| submodule.h | diff1 | diff2 | blobhistory |