Merge branch 'np/pack'

* np/pack:
fix repack with --max-pack-size
builtin-pack-object: cache small deltas
git-pack-objects: cache small deltas between big objects
builtin-pack-objects: don't fail, if delta is not possible

diff --combined Documentation/config.txt
index bb4d6e0e06ba9396a3dcc7a627422189aadf31c7,6ea4f10150ee4034e4c24752a444ef324506ea69..5868d587a905e0aaa55194c7716f9e258a030474
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -259,8 -259,7 +259,8 @@@ Common unit suffixes of 'k', 'm', or 'g
  core.excludeFile::
        In addition to '.gitignore' (per-directory) and
        '.git/info/exclude', git looks into this file for patterns
 -      of files which are not meant to be tracked.
 +      of files which are not meant to be tracked.  See
 +      gitlink:gitignore[5].
  
  alias.*::
        Command aliases for the gitlink:git[1] command wrapper - e.g.
@@@ -568,6 -567,15 +568,15 @@@ pack.compression:
        slowest.  If not set,  defaults to core.compression.  If that is
        not set,  defaults to -1.
  
+ pack.deltaCacheSize::
+       The maxium memory in bytes used for caching deltas in
+       gitlink:git-pack-objects[1].
+       A value of 0 means no limit. Defaults to 0.
+ 
+ pack.deltaCacheLimit::
+       The maxium size of a delta, that is cached in
+       gitlink:git-pack-objects[1]. Defaults to 1000.
+ 
  pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.