summaryrefslogtreecommitdiff
path: root/mergesort.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-23 13:35:05 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-23 13:35:06 -0700
commit4809ff858b78c94ada8bd8a61a89ae8d39eda193 (patch)
tree1fef747fa1f6ee157441152a789a9ed472d60405 /mergesort.h
parentaa3bb87176d42f1782c5030fa41e6e62492551c0 (diff)
parent5e73633dbf8a62190611f6eb438a1a2eaaffa919 (diff)
downloadgit-4809ff858b78c94ada8bd8a61a89ae8d39eda193.tar.gz
Merge branch 'hv/submodule-alt-odb'
When peeking into object stores of submodules, the code forgot that they might borrow objects from alternate object stores on their own. By Heiko Voigt * hv/submodule-alt-odb: teach add_submodule_odb() to look for alternates
Diffstat (limited to 'mergesort.h')
0 files changed, 0 insertions, 0 deletions