diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-06-02 12:18:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-06-02 12:18:56 -0700 |
| commit | 4bc708347e2b94564d9ec5e0e3a2ab0e3d6b2fd9 (patch) | |
| tree | 234be4b3cd221d4650b7eae0842141795d028220 /Documentation | |
| parent | 17c2929aa2ed999cbefa75ca5e933e1bf53a95bf (diff) | |
| parent | 5476a8adcc29985e5496dac7a340dfd178f43a17 (diff) | |
| download | git-4bc708347e2b94564d9ec5e0e3a2ab0e3d6b2fd9.tar.gz git-4bc708347e2b94564d9ec5e0e3a2ab0e3d6b2fd9.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bb4d6e0e0..5868d587a 100644 --- 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. |