Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx> --- Junio C Hamano <gitster@xxxxxxxxx> wrote: > You may want to add the new option to the output from "cmd -h" and > probably description of the configuration in the doc before any of this > gets official. Doc patch. :-) Feel free to squash, or to apply as its own change, I don't care either way. Documentation/config.txt | 14 ++++++++++++++ fast-import.c | 2 +- 2 files changed, 15 insertions(+), 1 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/fast-import.c b/fast-import.c index 8055f73..1bcf3bb 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2613,7 +2613,7 @@ static int git_pack_config(const char *k, const char *v, void *cb) } static const char fast_import_usage[] = -"git fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]"; +"git fast-import [--date-format=f] [--max-pack-size=n] [--big-file-threshold=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]"; int main(int argc, const char **argv) { -- 1.7.0.rc0.170.g7207c -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html