summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:21 -0700
commit7f109ef54e96ac7ae7e036487b881432170a3817 (patch)
tree51778e47095d0451da9cf187a94da67177fe57d7 /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'jk/patch-ids-no-merges' (diff)
parentpack-objects: use reachability bitmap index when generating non-stdout pack (diff)
downloadtgif-7f109ef54e96ac7ae7e036487b881432170a3817.tar.xz
Merge branch 'ks/pack-objects-bitmap'
Some codepaths in "git pack-objects" were not ready to use an existing pack bitmap; now they are and as the result they have become faster. * ks/pack-objects-bitmap: pack-objects: use reachability bitmap index when generating non-stdout pack pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions