summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-08-30 13:50:41 -0700
committerJunio C Hamano <gitster@pobox.com>2023-08-30 13:50:41 -0700
commitcc48906c3b0ce0cb472b6c97fa66fa2d396b59e4 (patch)
tree1a56bee71c98fad53c435df998f21cdc713cc2a6 /builtin/merge.c
parent74a2e88700efc2f1874967e7f007723d0865ac1b (diff)
parentf3d33f8cfeac8a2a00b4f87eec48dbca1d3080e0 (diff)
Merge branch 'ts/unpacklimit-config-fix'
transfer.unpackLimit ought to be used as a fallback, but overrode fetch.unpackLimit and receive.unpackLimit instead. * ts/unpacklimit-config-fix: transfer.unpackLimit: fetch/receive.unpackLimit takes precedence
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions