aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:07 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:07 -0700
commita08ca90938cf88c138edfd9f747d44ef1acf0c05 (patch)
treebafd04f5a96dc9b320e40ca4d3b88052727974f8 /Documentation
parent9d54ea6760cc4d7ee526d12cd00218bf19b79bf5 (diff)
parentc0a5e2d477baa9d3ebf7d3303a7d2b5dbc7c2ffe (diff)
downloadgit-a08ca90938cf88c138edfd9f747d44ef1acf0c05.tar.gz
git-a08ca90938cf88c138edfd9f747d44ef1acf0c05.tar.xz
Merge branch 'np/pack-default'
* np/pack-default: pack.indexversion config option now defaults to 2 repack.usedeltabaseoffset config option now defaults to "true"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/asciidoc.conf1
-rw-r--r--Documentation/config.txt22
2 files changed, 18 insertions, 5 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 10c1a151a..40d43b78e 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -8,6 +8,7 @@
# the command.
[attributes]
+asterisk=&#42;
plus=&#43;
caret=&#94;
startsb=&#91;
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6966384ce..561ff645f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -945,9 +945,17 @@ pack.indexVersion::
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.
+ packs. Version 2 is the default. Note that version 2 is enforced
+ and this config option ignored whenever the corresponding pack is
+ larger than 2 GB.
++
+If you have an old git that does not understand the version 2 `{asterisk}.idx` file,
+cloning or fetching over a non native protocol (e.g. "http" and "rsync")
+that will copy both `{asterisk}.pack` file and corresponding `{asterisk}.idx` file from the
+other side may give you a repository that cannot be accessed with your
+older version of git. If the `{asterisk}.pack` file is smaller than 2 GB, however,
+you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
+the `{asterisk}.idx` file.
pack.packSizeLimit::
The default maximum size of a pack. This setting only affects
@@ -1004,8 +1012,12 @@ remotes.<group>::
<group>". See linkgit:git-remote[1].
repack.usedeltabaseoffset::
- Allow linkgit:git-repack[1] to create packs that uses
- delta-base offset. Defaults to false.
+ By default, linkgit:git-repack[1] creates packs that use
+ delta-base offset. If you need to share your repository with
+ git older than version 1.4.4, either directly or via a dumb
+ protocol such as http, then you need to set this option to
+ "false" and repack. Access from old git versions over the
+ native protocol are unaffected by this option.
showbranch.default::
The default set of branches for linkgit:git-show-branch[1].