From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Oct 2010 19:11:26 +0000 (-0700)
Subject: Merge branch 'jk/repack-reuse-object'
X-Git-Tag: v1.7.4-rc0~186
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9018af4f98b98738f3cd1268a16d143762ebb6f2?ds=inline;hp=-c

Merge branch 'jk/repack-reuse-object'

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

9018af4f98b98738f3cd1268a16d143762ebb6f2
diff --combined Documentation/config.txt
index e6d74e6ade,ad81df3370..71ddb6c171
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -458,12 -458,6 +458,12 @@@ core.askpass:
  	'SSH_ASKPASS' environment variable or, failing that, a simple password
  	prompt. The external program shall be given a suitable prompt as
  	command line argument and write the password on its STDOUT.
 +
 +core.attributesfile::
 +	In addition to '.gitattributes' (per-directory) and
 +	'.git/info/attributes', git looks into this file for attributes
 +	(see linkgit:gitattributes[5]). Path expansions are made the same
 +	way as for `core.excludesfile`.
  
  core.editor::
  	Commands such as `commit` and `tag` that lets you edit
@@@ -1472,6 -1466,10 +1472,10 @@@ pack.compression:
  	not set,  defaults to -1, the zlib default, which is "a default
  	compromise between speed and compression (currently equivalent
  	to level 6)."
+ +
+ Note that changing the compression level will not automatically recompress
+ all existing objects. You can force recompression by passing the -F option
+ to linkgit:git-repack[1].
  
  pack.deltaCacheSize::
  	The maximum memory in bytes used for caching deltas in