X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=015910f27a450cdaec80f3bfc2679243126736c0;hb=89df580d0a2e97b0c7c072d87e5e815534deed56;hp=866e0534b8843af3c1789becd06b244162632d01;hpb=f368f5a6bc11855ab11013bc0c550bfc0868c140;p=git.git diff --git a/Documentation/config.txt b/Documentation/config.txt index 866e0534b..015910f27 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -630,9 +630,17 @@ pack.deltaCacheSize:: A value of 0 means no limit. Defaults to 0. pack.deltaCacheLimit:: - The maxium size of a delta, that is cached in + The maximum size of a delta, that is cached in gitlink:git-pack-objects[1]. Defaults to 1000. +pack.threads:: + Specifies the number of threads to spawn when searching for best + delta matches. This requires that gitlink:git-pack-objects[1] + be compiled with pthreads otherwise this option is ignored with a + warning. This is meant to reduce packing time on multiprocessor + machines. The required amount of memory for the delta search window + is however multiplied by the number of threads. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once.