diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
| commit | 0d9d89f61c58f72d96585a61defb0634873c38ac (patch) | |
| tree | fcb314481bb669dcf1f33ba3934786c1dcc51b12 /Documentation/config.txt | |
| parent | Merge branch 'jk/terse-push' into aw/mirror-push (diff) | |
| parent | Update draft release notes for 1.5.4 (diff) | |
| download | tgif-0d9d89f61c58f72d96585a61defb0634873c38ac.tar.xz | |
Merge master into aw/mirror-push
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index edf50cd211..8d5d200580 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -345,8 +345,8 @@ branch.<name>.mergeoptions:: supported. clean.requireForce:: - A boolean to make git-clean do nothing unless given -f or -n. Defaults - to false. + A boolean to make git-clean do nothing unless given -f + or -n. Defaults to true. color.branch:: A boolean to enable/disable color in the output of @@ -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. |