aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-02 22:28:49 -0800
committerJunio C Hamano <gitster@pobox.com>2010-03-02 22:28:49 -0800
commitf54555ca29146e72d674d090a760d7bfc9afd77f (patch)
tree10a56236dde9728905caa0044d1ffa9f42b474e4 /Documentation
parent9be3614eff36271d5f1cd460a568a219902cb044 (diff)
parentb500d5e11ea67d29dd7be622f65571d611d6e9a3 (diff)
downloadgit-f54555ca29146e72d674d090a760d7bfc9afd77f.tar.gz
git-f54555ca29146e72d674d090a760d7bfc9afd77f.tar.xz
Merge branch 'np/fast-import-idx-v2' into maint
* np/fast-import-idx-v2: fast-import: use the diff_delta() max_delta_size argument fast-import: honor pack.indexversion and pack.packsizelimit config vars fast-import: make default pack size unlimited fast-import: use write_idx_file() instead of custom code fast-import: use sha1write() for pack data fast-import: start using struct pack_idx_entry
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fast-import.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 6764ff188..19082b04e 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -45,10 +45,7 @@ OPTIONS
--max-pack-size=<n>::
Maximum size of each output packfile.
- The default is 4 GiB as that is the maximum allowed
- packfile size (due to file format limitations). Some
- importers may wish to lower this, such as to ensure the
- resulting packfiles fit on CDs.
+ The default is unlimited.
--big-file-threshold=<n>::
Maximum size of a blob that fast-import will attempt to