Merge branch 'ar/clone'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bb4d6e0e06ba9396a3dcc7a627422189aadf31c7..de408b6571c38c508c42a96d9d622226e401258e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -568,6 +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.
@@ -673,5 +682,3 @@ receive.denyNonFastForwards::
 transfer.unpackLimit::
        When `fetch.unpackLimit` or `receive.unpackLimit` are
        not set, the value of this variable is used instead.
-
-