Merge branch 'jk/repack-pack-keep-objects' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:10:05 +0000 (11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jul 2014 18:10:05 +0000 (11:10 -0700)
* jk/repack-pack-keep-objects:
repack: s/write_bitmap/&s/ in code
repack: respect pack.writebitmaps
repack: do not accidentally pack kept objects by default

1  2 
builtin/repack.c
t/t7700-repack.sh
Simple merge
Simple merge