aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-11-01 23:26:04 -0400
committerJunio C Hamano <gitster@pobox.com>2007-11-02 01:32:02 -0700
commit4d00bda2aa9dd8cd6ec4015832b80eb1273d46d7 (patch)
treed51a3b7d5534e1b2aeaba0305d4de493b04d6ef8 /Documentation/config.txt
parent3e4bb087a18435b12eb82116e93af2887578e816 (diff)
downloadgit-4d00bda2aa9dd8cd6ec4015832b80eb1273d46d7.tar.gz
git-4d00bda2aa9dd8cd6ec4015832b80eb1273d46d7.tar.xz
make the pack index version configurable
It is a good idea to use pack index version 2 all the time since it has proper protection against propagation of certain pack corruptions when repacking which is not possible with index version 1, as demonstrated in test t5302. Hence this config option. The default is still pack index version 1. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index edf50cd21..0df004ea2 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.