summaryrefslogtreecommitdiff
path: root/mergetools/meld
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-01-31 13:32:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-31 13:32:06 -0800
commit81037171a59db996e05b98878359362ead6029f9 (patch)
tree857bc58982cc30c418c38906f88894736dd0877f /mergetools/meld
parentMerge branch 'nd/config-misc-fixes' into maint (diff)
parentrepack: die on incremental + write-bitmap-index (diff)
downloadtgif-81037171a59db996e05b98878359362ead6029f9.tar.xz
Merge branch 'dt/disable-bitmap-in-auto-gc' into maint
It is natural that "git gc --auto" may not attempt to pack everything into a single pack, and there is no point in warning when the user has configured the system to use the pack bitmap, leading to disabling further "gc". * dt/disable-bitmap-in-auto-gc: repack: die on incremental + write-bitmap-index auto gc: don't write bitmaps for incremental repacks
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions