Merge branch 'jc/maint-fetch-alt'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2011 04:37:53 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2011 04:37:53 +0000 (21:37 -0700)
commit91b3c7ce8e189b90d3203265c9625806a15045e1
tree2287f84dbd07706e74db16896e8e7f3a7d6dd7ed
parent1c92e394468c927f129c8f2a138b760f884e3bed
parente52d719266a06a8553043cb5616d9b4ce4abd27a
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
builtin/fetch-pack.c
builtin/receive-pack.c
transport.c