summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-29 12:47:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-29 12:47:54 -0800
commit5d3635db19c6dff4fb063fabfa4161fd3b8285f0 (patch)
tree30671c79e96d06267eda7d088a4ef7fd86c3ad47 /builtin/merge.c
parentMerge branch 'jt/fetch-pack-v2' (diff)
parentfetch: ensure submodule objects fetched (diff)
downloadtgif-5d3635db19c6dff4fb063fabfa4161fd3b8285f0.tar.xz
Merge branch 'sb/submodule-recursive-fetch-gets-the-tip'
"git fetch --recurse-submodules" may not fetch the necessary commit that is bound to the superproject, which is getting corrected. * sb/submodule-recursive-fetch-gets-the-tip: fetch: ensure submodule objects fetched submodule.c: fetch in submodules git directory instead of in worktree submodule: migrate get_next_submodule to use repository structs repository: repo_submodule_init to take a submodule struct submodule: store OIDs in changed_submodule_names submodule.c: tighten scope of changed_submodule_names struct submodule.c: sort changed_submodule_names before searching it submodule.c: fix indentation sha1-array: provide oid_array_filter
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions