summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:55 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:55 -0800
commitd1afa8baa271fe0df1a15a6800f23f972abc5293 (patch)
tree004b439c43f83336c011139f0ddff67a45b7d233 /ll-merge.h
parent2bbf77dde2b47f2b8c9769c4d64f7f2f591d1e99 (diff)
parent90108a2441fb57f69c3f25d072d1952b306b77ab (diff)
downloadgit-d1afa8baa271fe0df1a15a6800f23f972abc5293.tar.gz
Merge branch 'jk/parse-object-cached'
* jk/parse-object-cached: upload-pack: avoid parsing tag destinations upload-pack: avoid parsing objects during ref advertisement parse_object: try internal cache before reading object db
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions