![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Jun 2006 22:24:26 +0000 (15:24 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 2 Jun 2006 22:24:26 +0000 (15:24 -0700) | ||
| commit | 1da07343ae553af07eac09cc741ca91b6615023c | |
| tree | cfbde1830507f498fd1dabe222a65d684ab78b56 | tree | snapshot |
| parent | 0fa5cb0d1e13bf757b41b0b0665305b7c819ee60 | commit | diff |
| parent | 86f7780c0b77b3c162f85d499189f9d1f0b296df | commit | diff |
Merge branch 'master' into next
* master:
sha1_file: avoid re-preparing duplicate packs
handle concurrent pruning of packed objects
* master:
sha1_file: avoid re-preparing duplicate packs
handle concurrent pruning of packed objects