diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-01 20:41:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-01 20:42:00 (GMT) |
| commit | 844ad3d9a0418b4a3a6a944a50d65403121a0eb6 (patch) | |
| tree | 2b74a0fb6cd6d5144814410cbc1642365249bc0a /Documentation | |
| parent | b2c2e4c22c6a4fe151f02380d247cf3d9a9d5d1e (diff) | |
| parent | 5eef828bc03649ba11acc05c983d72823c27f0bb (diff) | |
| download | git-844ad3d9a0418b4a3a6a944a50d65403121a0eb6.zip git-844ad3d9a0418b4a3a6a944a50d65403121a0eb6.tar.gz git-844ad3d9a0418b4a3a6a944a50d65403121a0eb6.tar.bz2 | |
Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob
* sp/maint-fast-import-large-blob:
fast-import: Stream very large blobs directly to pack
bash: don't offer remote transport helpers as subcommands
Conflicts:
fast-import.c
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 17901e2..36ad992 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -417,6 +417,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 ff4022c..3f4380e 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. |