Merge branch 'jk/repack-reuse-object' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:45:07 +0000 (24 12:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 20:45:07 +0000 (24 12:45 -0800)
* 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

1  2 
Documentation/config.txt
Documentation/git-repack.txt

Simple merge
@@@ -8,7 -8,7 +8,7 @@@ git-repack - Pack unpacked objects in 
  
  SYNOPSIS
  --------
- 'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
 -'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=N] [--depth=N]
++'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
  
  DESCRIPTION
  -----------