Andrew's git / gitweb.git / diff
?
Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Jun 2006 22:24:26 +0000 (15:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Jun 2006 22:24:26 +0000 (15:24 -0700)
* master:
sha1_file: avoid re-preparing duplicate packs
handle concurrent pruning of packed objects

Trivial merge