Merge branch 'jk/repack-reuse-object' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:45:07 +0000 (12:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:45:07 +0000 (12:45 -0800)
commitbe0a4c820094c72cff67b69de8ba7ce88145ce86
treefb9bac5ca8cd01ac38f5748547bbf689a8d02f15
parent2f9d2e22cb553d26e355e63171678a848170dcf8
parent89d71f7564cb3945b2775092284a4de807f577e4
Merge branch 'jk/repack-reuse-object' into maint

* jk/repack-reuse-object:
  Documentation: pack.compression: explain how to recompress
  repack: add -F flag to let user choose between --no-reuse-delta/object

Conflicts:
Documentation/git-repack.txt
Documentation/config.txt
Documentation/git-repack.txt