![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:19:34 +0000 (15:19 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Dec 2011 23:19:34 +0000 (15:19 -0800) | ||
| commit | cddec4f8aea4809131dc1b1765d6c8e2a498a58e | |
| tree | 126e27a28d41df858b34e7f85510d3a7081ed0d4 | tree | snapshot |
| parent | 33fba9c64e305c64b4d6f4c31f02c1dd7e8fbfa8 | commit | diff |
| parent | f63c79dbc8c5670533557d311ed0e81fcfc9fe3a | commit | diff |
Merge branch 'jc/maint-pack-object-cycle'
* jc/maint-pack-object-cycle:
pack-object: tolerate broken packs that have duplicated objects
Conflicts:
builtin/pack-objects.c
* jc/maint-pack-object-cycle:
pack-object: tolerate broken packs that have duplicated objects
Conflicts:
builtin/pack-objects.c
| builtin/pack-objects.c | diff1 | | diff2 | | blob | history |