Merge branch 'ew/repack-with-bitmaps-by-default'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:22 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:22 +0000 (11:30 -0700)
Generation of pack bitmaps are now disabled when .keep files exist,
as these are mutually exclusive features.

* ew/repack-with-bitmaps-by-default:
  repack: disable bitmaps-by-default if .keep files exist

1  2 
builtin/repack.c

Simple merge