Merge branch 'ew/doc-split-pack-disables-bitmap'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:28 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:28 +0000 (13:40 -0700)
Doc update.

* ew/doc-split-pack-disables-bitmap:
pack-objects: warn on split packs disabling bitmaps

1  2 
Documentation/config.txt
builtin/pack-objects.c
Simple merge
Simple merge