index bb4d6e0e06ba9396a3dcc7a627422189aadf31c7..5868d587a905e0aaa55194c7716f9e258a030474 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
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.