Andrew's git / gitweb.git / diff
?
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 patch | diff1 | diff2 | blob | history
builtin/fetch-pack.c patch | diff1 | diff2 | blob | history
diff --cc Makefile
Simple merge
diff --cc builtin/fetch-pack.c
Simple merge