From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 20:45:07 +0000 (-0800)
Subject: Merge branch 'jk/repack-reuse-object' into maint
X-Git-Tag: v1.7.3.3~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=be0a4c820094c72cff67b69de8ba7ce88145ce86;p=git.git

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
---

be0a4c820094c72cff67b69de8ba7ce88145ce86
diff --cc Documentation/git-repack.txt
index af79b8651,9566727f7..27f7865b0
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@@ -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
  -----------