From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2019 18:30:22 +0000 (-0700)
Subject: Merge branch 'ew/repack-with-bitmaps-by-default'
X-Git-Tag: v2.23.0-rc0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d60dc1a0b3829f3c4d69696f43f1c178c0701cdb;p=thirdparty%2Fgit.git

Merge branch 'ew/repack-with-bitmaps-by-default'

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
---

d60dc1a0b3829f3c4d69696f43f1c178c0701cdb