Merge branch 'jk/haves-from-alternate-odb'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 May 2011 06:51:22 +0000 (23:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 May 2011 06:51:22 +0000 (23:51 -0700)
* jk/haves-from-alternate-odb:
  receive-pack: eliminate duplicate .have refs
  bisect: refactor sha1_array into a generic sha1 list
  refactor refs_from_alternate_cb to allow passing extra data

1  2 
Makefile
builtin/fetch-pack.c

diff --cc Makefile
Simple merge
Simple merge