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

diff --combined Documentation/config.txt
index e6d74e6ade440a9ea26c4e2f22d54aad6cf6044e,ad81df33705d42b3ab6b63ef882cb5965d51ec8a..71ddb6c1712e7d042f227069eec8a3083480fe27
--- 1/Documentation/config.txt
--- 2/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