mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'np/pack'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2007-06-02 12:18:56 -07:00
parent 17c2929aa2 5476a8adcc
commit 4bc708347e
2 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/config.txt
View File

@ -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.