Merge branch 'jk/repack-pack-writebitmaps-config'

* jk/repack-pack-writebitmaps-config:
  t7700: drop explicit --no-pack-kept-objects from .keep test
  repack: introduce repack.writeBitmaps config option
  repack: simplify handling of --write-bitmap-index
  pack-objects: stop respecting pack.writebitmaps

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/repack.c
Simple merge

diff --cc t/t5310-pack-bitmaps.sh
Simple merge

diff --cc t/t7700-repack.sh
Simple merge