Merge branch 'jk/repack-pack-writebitmaps-config'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:23:19 +0000 (12:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 19:23:19 +0000 (12:23 -0700)
* 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

1  2 
Documentation/config.txt
builtin/pack-objects.c
builtin/repack.c
t/t5310-pack-bitmaps.sh
t/t7700-repack.sh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge