diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:11:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-04 01:11:17 -0700 |
| commit | e091653951ae516a923338874bfe550894cd1bc9 (patch) | |
| tree | e9620973ebe58be7edfb13e5df57f8e7262ce851 /Documentation | |
| parent | 2dfffd3e09b2541b1bfcc840a65eac0251832175 (diff) | |
| parent | 79814f425c00129dbdbdc3c99d04af52ccc58254 (diff) | |
| download | git-e091653951ae516a923338874bfe550894cd1bc9.tar.gz | |
Merge branch 'np/pack'
* np/pack:
pack-objects: get rid of an ugly cast
make the pack index version configurable
Conflicts:
builtin-pack-objects.c
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 edf50cd211..0df004ea26 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -661,6 +661,15 @@ pack.threads:: machines. The required amount of memory for the delta search window is however multiplied by the number of threads. +pack.indexVersion:: + Specify the default pack index version. Valid values are 1 for + legacy pack index used by Git versions prior to 1.5.2, and 2 for + the new pack index with capabilities for packs larger than 4 GB + as well as proper protection against the repacking of corrupted + packs. Version 2 is selected and this config option ignored + whenever the corresponding pack is larger than 2 GB. Otherwise + the default is 1. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. |