diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-10 21:32:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-10 21:32:20 (GMT) |
| commit | 57ffc0e775b2a77f2e88cf1cfb6c0c259706fbea (patch) | |
| tree | 36d01db657afff5d5d7c3579429856c6a339dc6e /Documentation | |
| parent | 800d1fb0ab4bc9c1f4cd13f7cb7d8851f23a3e50 (diff) | |
| parent | 5eef828bc03649ba11acc05c983d72823c27f0bb (diff) | |
| download | git-57ffc0e775b2a77f2e88cf1cfb6c0c259706fbea.zip git-57ffc0e775b2a77f2e88cf1cfb6c0c259706fbea.tar.gz git-57ffc0e775b2a77f2e88cf1cfb6c0c259706fbea.tar.bz2 | |
Merge branch 'sp/maint-fast-import-large-blob' into maint
* sp/maint-fast-import-large-blob:
fast-import: Stream very large blobs directly to pack
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 14 | ||||
| -rw-r--r-- | Documentation/git-fast-import.txt | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f7728ec..b16a20b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -409,6 +409,20 @@ You probably do not need to adjust this value. + Common unit suffixes of 'k', 'm', or 'g' are supported. +core.bigFileThreshold:: + Files larger than this size are stored deflated, without + attempting delta compression. Storing large files without + delta compression avoids excessive memory usage, at the + slight expense of increased disk usage. ++ +Default is 512 MiB on all platforms. This should be reasonable +for most projects as source code and other text files can still +be delta compressed, but larger binary media files won't be. ++ +Common unit suffixes of 'k', 'm', or 'g' are supported. ++ +Currently only linkgit:git-fast-import[1] honors this setting. + core.excludesfile:: In addition to '.gitignore' (per-directory) and '.git/info/exclude', git looks into this file for patterns diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index e6d364f..79c5f69 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -50,6 +50,12 @@ OPTIONS importers may wish to lower this, such as to ensure the resulting packfiles fit on CDs. +--big-file-threshold=<n>:: + Maximum size of a blob that fast-import will attempt to + create a delta for, expressed in bytes. The default is 512m + (512 MiB). Some importers may wish to lower this on systems + with constrained memory. + --depth=<n>:: Maximum delta depth, for blob and tree deltification. Default is 10. |