Andrew's git / gitweb.git / diff
?
Merge branch 'jk/peel-ref' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 19:59:55 +0000 (12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 19:59:55 +0000 (12:59 -0700)
* jk/peel-ref:
upload-pack: load non-tip "want" objects from disk
upload-pack: make sure "want" objects are parsed
upload-pack: drop lookup-before-parse optimization

1  2 
t/t5500-fetch-pack.sh patch | diff1 | diff2 | blob | history
upload-pack.c patch | diff1 | diff2 | blob | history
diff --cc t/t5500-fetch-pack.sh
Simple merge
diff --cc upload-pack.c
Simple merge