summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-31 15:49:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-31 15:49:46 -0700
commit63728e481451b8e218bec4d21ce085471d90fe7a (patch)
tree6cfe1af9cac978bfd64c2f0ea14db0abc5bedd49 /builtin/merge-recursive.c
parentMerge branch 'dd/diff-customize-index-line-abbrev' (diff)
parentfetch-pack: in partial clone, pass --promisor (diff)
downloadtgif-63728e481451b8e218bec4d21ce085471d90fe7a.tar.xz
Merge branch 'jt/promisor-pack-fix'
Updates into a lazy/partial clone with a submodule did not work well with transfer.fsckobjects set. * jt/promisor-pack-fix: fetch-pack: in partial clone, pass --promisor
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions