summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-02-01 12:41:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-01 12:42:00 -0800
commit844ad3d9a0418b4a3a6a944a50d65403121a0eb6 (patch)
tree2b74a0fb6cd6d5144814410cbc1642365249bc0a /Documentation/config.txt
parentgitweb.js: Workaround for IE8 bug (diff)
parentfast-import: Stream very large blobs directly to pack (diff)
downloadtgif-844ad3d9a0418b4a3a6a944a50d65403121a0eb6.tar.xz
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/config.txt')
-rw-r--r--Documentation/config.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 17901e244a..36ad992a56 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