summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:26:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:26:50 -0700
commit13b49f1e7463c46272c0b3b9b1952dc519086b6d (patch)
tree3d0f6d4dcf53afc524eac847f4a12204d134cbe3 /Documentation
parentMerge branch 'nd/i18n-progress' (diff)
parentread-cache: add index.version config variable (diff)
downloadtgif-13b49f1e7463c46272c0b3b9b1952dc519086b6d.tar.xz
Merge branch 'tg/index-v4-format'
* tg/index-v4-format: read-cache: add index.version config variable test-lib: allow setting the index format version introduce GIT_INDEX_VERSION environment variable
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/git.txt5
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 73904bce55..989eb80ac1 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1607,6 +1607,10 @@ imap::
The configuration variables in the 'imap' section are described
in linkgit:git-imap-send[1].
+index.version::
+ Specify the version with which new index files should be
+ initialized. This does not affect existing repositories.
+
init.templatedir::
Specify the directory from which templates will be copied.
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 02bbc084b8..27a199ca1a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -720,6 +720,11 @@ Git so take care if using Cogito etc.
index file. If not specified, the default of `$GIT_DIR/index`
is used.
+'GIT_INDEX_VERSION'::
+ This environment variable allows the specification of an index
+ version for new repositories. It won't affect existing index
+ files. By default index file version [23] is used.
+
'GIT_OBJECT_DIRECTORY'::
If the object storage directory is specified via this
environment variable then the sha1 directories are created