From: Junio C Hamano Date: Wed, 3 Feb 2010 05:47:51 +0000 (-0800) Subject: Merge branch 'sp/fast-import-large-blob' X-Git-Tag: v1.7.0-rc2~24 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3b91fad1843e98fde9c287f72315bd456e18f2c?hp=-c Merge branch 'sp/fast-import-large-blob' * sp/fast-import-large-blob: fast-import: Stream very large blobs directly to pack --- d3b91fad1843e98fde9c287f72315bd456e18f2c diff --combined Documentation/git-fast-import.txt index fa7d2fe142,3f4380eb28..2691114440 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@@ -50,6 -50,12 +50,12 @@@ OPTION importers may wish to lower this, such as to ensure the resulting packfiles fit on CDs. + --big-file-threshold=:: + 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=:: Maximum delta depth, for blob and tree deltification. Default is 10. @@@ -152,7 -158,7 +158,7 @@@ fast-forward update, fast-import will s prints a warning message. fast-import will always attempt to update all branch refs, and does not stop on the first failure. -Branch updates can be forced with \--force, but its recommended that +Branch updates can be forced with \--force, but it's recommended that this only be used on an otherwise quiet repository. Using \--force is not necessary for an initial import into an empty repository. @@@ -267,7 -273,7 +273,7 @@@ is always copied into the identity stri created by fast-import. There is no way to specify a different time or timezone. + -This particular format is supplied as its short to implement and +This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'. @@@ -420,7 -426,7 +426,7 @@@ quoting or escaping syntax is supporte Here `` is any of the following: * The name of an existing branch already in fast-import's internal branch - table. If fast-import doesn't know the name, its treated as a SHA-1 + table. If fast-import doesn't know the name, it's treated as a SHA-1 expression. * A mark reference, `:`, where `` is the mark number. @@@ -759,7 -765,7 +765,7 @@@ assigned mark The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that -directly to `commit`. This is typically more work than its worth +directly to `commit`. This is typically more work than it's worth however, as marks are inexpensive to store and easy to use. `data`