summaryrefslogtreecommitdiff
path: root/replace_object.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-22 21:37:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-22 21:37:53 -0700
commit91b3c7ce8e189b90d3203265c9625806a15045e1 (patch)
tree2287f84dbd07706e74db16896e8e7f3a7d6dd7ed /replace_object.c
parentMerge branch 'sg/complete-symmetric-diff' (diff)
parentfetch-pack: objects in our alternates are available to us (diff)
downloadtgif-91b3c7ce8e189b90d3203265c9625806a15045e1.tar.xz
Merge branch 'jc/maint-fetch-alt'
* jc/maint-fetch-alt: fetch-pack: objects in our alternates are available to us refs_from_alternate: helper to use refs from alternates Conflicts: builtin/receive-pack.c
Diffstat (limited to 'replace_object.c')
0 files changed, 0 insertions, 0 deletions