diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:12 -0800 |
| commit | cf417e2c1f50578d8f7eccb65b981042d05939f0 (patch) | |
| tree | 0c72f5c975f754b32e38e08ff10f9f856ec8f343 /mergetools/diffmerge | |
| parent | Merge branch 'ls/p4-retry-thrice' (diff) | |
| parent | repack: die on incremental + write-bitmap-index (diff) | |
| download | tgif-cf417e2c1f50578d8f7eccb65b981042d05939f0.tar.xz | |
Merge branch 'dt/disable-bitmap-in-auto-gc'
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/diffmerge')
0 files changed, 0 insertions, 0 deletions