@ -42,13 +42,13 @@ OPTIONS
--quiet::
--quiet::
Disable all non-fatal output, making fast-import silent when it
Disable all non-fatal output, making fast-import silent when it
is successful. This option disables the output shown by
is successful. This option disables the output shown by
\--stats.
--stats.
--stats::
--stats::
Display some basic statistics about the objects fast-import has
Display some basic statistics about the objects fast-import has
created, the packfiles they were stored into, and the
created, the packfiles they were stored into, and the
memory used by fast-import during this run. Showing this output
memory used by fast-import during this run. Showing this output
is currently the default, but can be disabled with \--quiet.
is currently the default, but can be disabled with --quiet.
Options for Frontends
Options for Frontends
~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~
@ -81,12 +81,12 @@ Locations of Marks Files
have been completed, or to save the marks table across
have been completed, or to save the marks table across
incremental runs. As <file> is only opened and truncated
incremental runs. As <file> is only opened and truncated
at checkpoint (or completion) the same path can also be
at checkpoint (or completion) the same path can also be
safely given to \--import-marks.
safely given to --import-marks.
--import-marks=<file>::
--import-marks=<file>::
Before processing any input, load the marks specified in
Before processing any input, load the marks specified in
<file>. The input file must exist, must be readable, and
<file>. The input file must exist, must be readable, and
must use the same format as produced by \--export-marks.
must use the same format as produced by --export-marks.
Multiple options may be supplied to import more than one
Multiple options may be supplied to import more than one
set of marks. If a mark is defined to different values,
set of marks. If a mark is defined to different values,
the last file wins.
the last file wins.
@ -179,8 +179,8 @@ fast-forward update, fast-import will skip updating that ref and instead
prints a warning message. fast-import will always attempt to update all
prints a warning message. fast-import will always attempt to update all
branch refs, and does not stop on the first failure.
branch refs, and does not stop on the first failure.
Branch updates can be forced with \--force, but it's 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
this only be used on an otherwise quiet repository. Using --force
is not necessary for an initial import into an empty repository.
is not necessary for an initial import into an empty repository.
@ -231,11 +231,11 @@ Date Formats
~~~~~~~~~~~~
~~~~~~~~~~~~
The following date formats are supported. A frontend should select
The following date formats are supported. A frontend should select
the format it will use for this import by passing the format name
the format it will use for this import by passing the format name
in the \--date-format=<fmt> command-line option.
in the --date-format=<fmt> command-line option.
`raw`::
`raw`::
This is the Git native format and is `<time> SP <offutc>`.
This is the Git native format and is `<time> SP <offutc>`.
It is also fast-import's default format, if \--date-format was
It is also fast-import's default format, if --date-format was
not specified.
not specified.
+
+
The time of the event is specified by `<time>` as the number of
The time of the event is specified by `<time>` as the number of
@ -437,7 +437,7 @@ the email address from the other fields in the line. Note that
of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded.
of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded.
The time of the change is specified by `<when>` using the date format
The time of the change is specified by `<when>` using the date format
that was selected by the \--date-format=<fmt> command-line option.
that was selected by the --date-format=<fmt> command-line option.
See ``Date Formats'' above for the set of supported formats, and
See ``Date Formats'' above for the set of supported formats, and
their syntax.
their syntax.
@ -888,7 +888,7 @@ save out all current branch refs, tags and marks.
....
....
Note that fast-import automatically switches packfiles when the current
Note that fast-import automatically switches packfiles when the current
packfile reaches \--max-pack-size, or 4 GiB, whichever limit is
packfile reaches --max-pack-size, or 4 GiB, whichever limit is
smaller. During an automatic packfile switch fast-import does not update
smaller. During an automatic packfile switch fast-import does not update
the branch refs, tags or marks.
the branch refs, tags or marks.
@ -1226,7 +1226,7 @@ users of fast-import, and are offered here as suggestions.
Use One Mark Per Commit
Use One Mark Per Commit
~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~
When doing a repository conversion, use a unique mark per commit
When doing a repository conversion, use a unique mark per commit
(`mark :<n>`) and supply the \--export-marks option on the command
(`mark :<n>`) and supply the --export-marks option on the command
line. fast-import will dump a file which lists every mark and the Git
line. fast-import will dump a file which lists every mark and the Git
object SHA-1 that corresponds to it. If the frontend can tie
object SHA-1 that corresponds to it. If the frontend can tie
the marks back to the source repository, it is easy to verify the
the marks back to the source repository, it is easy to verify the
@ -1291,7 +1291,7 @@ even for considerably large projects (100,000+ commits).
However repacking the repository is necessary to improve data
However repacking the repository is necessary to improve data
locality and access performance. It can also take hours on extremely
locality and access performance. It can also take hours on extremely
large projects (especially if -f and a large \--window parameter is
large projects (especially if -f and a large --window parameter is
used). Since repacking is safe to run alongside readers and writers,
used). Since repacking is safe to run alongside readers and writers,
run the repack in the background and let it finish when it finishes.
run the repack in the background and let it finish when it finishes.
There is no reason to wait to explore your new Git project!
There is no reason to wait to explore your new Git project!
@ -1305,7 +1305,7 @@ Repacking Historical Data
~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~
If you are repacking very old imported data (e.g. older than the
If you are repacking very old imported data (e.g. older than the
last year), consider expending some extra CPU time and supplying
last year), consider expending some extra CPU time and supplying
\--window=50 (or higher) when you run 'git repack'.
--window=50 (or higher) when you run 'git repack'.
This will take longer, but will also produce a smaller packfile.
This will take longer, but will also produce a smaller packfile.
You only need to expend the effort once, and everyone using your
You only need to expend the effort once, and everyone using your
project will benefit from the smaller repository.
project will benefit from the smaller repository.
@ -1407,7 +1407,7 @@ branch, their in-memory storage size can grow to a considerable size
fast-import automatically moves active branches to inactive status based on
fast-import automatically moves active branches to inactive status based on
a simple least-recently-used algorithm. The LRU chain is updated on
a simple least-recently-used algorithm. The LRU chain is updated on
each `commit` command. The maximum number of active branches can be
each `commit` command. The maximum number of active branches can be
increased or decreased on the command line with \--active-branches=.
increased or decreased on the command line with --active-branches=.
per active tree
per active tree
~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~