diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:04:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 22:04:50 -0800 |
| commit | 2e8722fc9e34a53ae19f2b60b1d3038aa2af0ae6 (patch) | |
| tree | 1b1831c92a6ef6c87647f0952f01c51c660e75a4 /lockfile.c | |
| parent | Merge branch 'jc/index-pack-reject-dups' into maint (diff) | |
| parent | pack-object: tolerate broken packs that have duplicated objects (diff) | |
| download | tgif-2e8722fc9e34a53ae19f2b60b1d3038aa2af0ae6.tar.xz | |
Merge branch 'jc/maint-pack-object-cycle' into maint
* jc/maint-pack-object-cycle:
pack-object: tolerate broken packs that have duplicated objects
Conflicts:
builtin/pack-objects.c
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions