summaryrefslogtreecommitdiff
path: root/git_remote_helpers
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 22:04:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-13 22:04:50 -0800
commit2e8722fc9e34a53ae19f2b60b1d3038aa2af0ae6 (patch)
tree1b1831c92a6ef6c87647f0952f01c51c660e75a4 /git_remote_helpers
parentMerge branch 'jc/index-pack-reject-dups' into maint (diff)
parentpack-object: tolerate broken packs that have duplicated objects (diff)
downloadtgif-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 'git_remote_helpers')
0 files changed, 0 insertions, 0 deletions