@matheusbsbs / matheus-bagliano / commits / 882227f117
Fork 0

Correct spelling of fast-import in docs.

Its spelled 'fast-import', not 'gfi'. Linus and Dscho have both recently pointed this out to me on the mailing list. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Shawn O. Pearce committed Feb 8, 2007 at 13:49 UTC 882227f117a1356a7132cfdc24b1e2389b16133b
1 file changed +78 -78
Documentation/git-fast-import.txt
+78 -78
@@ -15,15 +15,15 @@ DESCRIPTION
15 This program is usually not what the end user wants to run directly.
16 Most end users want to use one of the existing frontend programs,
17 which parses a specific type of foreign source and feeds the contents
18 -stored there to git-fast-import (gfi).
18 +stored there to git-fast-import.
19
20 -gfi reads a mixed command/data stream from standard input and
20 +fast-import reads a mixed command/data stream from standard input and
21 writes one or more packfiles directly into the current repository.
22 When EOF is received on standard input, fast import writes out
23 updated branch and tag refs, fully updating the current repository
24 with the newly imported data.
25
26 -The gfi backend itself can import into an empty repository (one that
26 +The fast-import backend itself can import into an empty repository (one that
27 has already been initialized by gitlink:git-init[1]) or incrementally
28 update an existing populated repository. Whether or not incremental
29 imports are supported from a particular foreign source depends on
@@ -34,7 +34,7 @@ OPTIONS
34 -------
35 --date-format=<fmt>::
36 Specify the type of dates the frontend will supply to
37 - gfi within `author`, `committer` and `tagger` commands.
37 + fast-import within `author`, `committer` and `tagger` commands.
38 See ``Date Formats'' below for details about which formats
39 are supported, and their syntax.
40
@@ -65,28 +65,28 @@ OPTIONS
65 have been completed.
66
67 --quiet::
68 - Disable all non-fatal output, making gfi silent when it
68 + Disable all non-fatal output, making fast-import silent when it
69 is successful. This option disables the output shown by
70 \--stats.
71
72 --stats::
73 - Display some basic statistics about the objects gfi has
73 + Display some basic statistics about the objects fast-import has
74 created, the packfiles they were stored into, and the
75 - memory used by gfi during this run. Showing this output
75 + memory used by fast-import during this run. Showing this output
76 is currently the default, but can be disabled with \--quiet.
77
78
79 Performance
80 -----------
81 -The design of gfi allows it to import large projects in a minimum
81 +The design of fast-import allows it to import large projects in a minimum
82 amount of memory usage and processing time. Assuming the frontend
83 -is able to keep up with gfi and feed it a constant stream of data,
83 +is able to keep up with fast-import and feed it a constant stream of data,
84 import times for projects holding 10+ years of history and containing
85 100,000+ individual commits are generally completed in just 1-2
86 hours on quite modest (~$2,000 USD) hardware.
87
88 Most bottlenecks appear to be in foreign source data access (the
89 -source just cannot extract revisions fast enough) or disk IO (gfi
89 +source just cannot extract revisions fast enough) or disk IO (fast-import
90 writes as fast as the disk will take the data). Imports will run
91 faster if the source data is stored on a different drive than the
92 destination Git repository (due to less IO contention).
@@ -94,28 +94,28 @@ destination Git repository (due to less IO contention).
94
95 Development Cost
96 ----------------
97 -A typical frontend for gfi tends to weigh in at approximately 200
97 +A typical frontend for fast-import tends to weigh in at approximately 200
98 lines of Perl/Python/Ruby code. Most developers have been able to
99 create working importers in just a couple of hours, even though it
100 -is their first exposure to gfi, and sometimes even to Git. This is
100 +is their first exposure to fast-import, and sometimes even to Git. This is
101 an ideal situation, given that most conversion tools are throw-away
102 (use once, and never look back).
103
104
105 Parallel Operation
106 ------------------
107 -Like `git-push` or `git-fetch`, imports handled by gfi are safe to
107 +Like `git-push` or `git-fetch`, imports handled by fast-import are safe to
108 run alongside parallel `git repack -a -d` or `git gc` invocations,
109 or any other Git operation (including `git prune`, as loose objects
110 -are never used by gfi).
110 +are never used by fast-import).
111
112 -gfi does not lock the branch or tag refs it is actively importing.
113 -After the import, during its ref update phase, gfi tests each
112 +fast-import does not lock the branch or tag refs it is actively importing.
113 +After the import, during its ref update phase, fast-import tests each
114 existing branch ref to verify the update will be a fast-forward
115 update (the commit stored in the ref is contained in the new
116 history of the commit to be written). If the update is not a
117 -fast-forward update, gfi will skip updating that ref and instead
118 -prints a warning message. gfi will always attempt to update all
117 +fast-forward update, fast-import will skip updating that ref and instead
118 +prints a warning message. fast-import will always attempt to update all
119 branch refs, and does not stop on the first failure.
120
121 Branch updates can be forced with \--force, but its recommended that
@@ -125,35 +125,35 @@ is not necessary for an initial import into an empty repository.
125
126 Technical Discussion
127 --------------------
128 -gfi tracks a set of branches in memory. Any branch can be created
128 +fast-import tracks a set of branches in memory. Any branch can be created
129 or modified at any point during the import process by sending a
130 `commit` command on the input stream. This design allows a frontend
131 program to process an unlimited number of branches simultaneously,
132 generating commits in the order they are available from the source
133 data. It also simplifies the frontend programs considerably.
134
135 -gfi does not use or alter the current working directory, or any
135 +fast-import does not use or alter the current working directory, or any
136 file within it. (It does however update the current Git repository,
137 as referenced by `GIT_DIR`.) Therefore an import frontend may use
138 the working directory for its own purposes, such as extracting file
139 revisions from the foreign source. This ignorance of the working
140 -directory also allows gfi to run very quickly, as it does not
140 +directory also allows fast-import to run very quickly, as it does not
141 need to perform any costly file update operations when switching
142 between branches.
143
144 Input Format
145 ------------
146 With the exception of raw file data (which Git does not interpret)
147 -the gfi input format is text (ASCII) based. This text based
147 +the fast-import input format is text (ASCII) based. This text based
148 format simplifies development and debugging of frontend programs,
149 especially when a higher level language such as Perl, Python or
150 Ruby is being used.
151
152 -gfi is very strict about its input. Where we say SP below we mean
152 +fast-import is very strict about its input. Where we say SP below we mean
153 *exactly* one space. Likewise LF means one (and only one) linefeed.
154 Supplying additional whitespace characters will cause unexpected
155 results, such as branch names or file names with leading or trailing
156 -spaces in their name, or early termination of gfi when it encounters
156 +spaces in their name, or early termination of fast-import when it encounters
157 unexpected input.
158
159 Date Formats
@@ -164,7 +164,7 @@ in the \--date-format=<fmt> command line option.
164
165 `raw`::
166 This is the Git native format and is `<time> SP <offutc>`.
167 - It is also gfi's default format, if \--date-format was
167 + It is also fast-import's default format, if \--date-format was
168 not specified.
169 +
170 The time of the event is specified by `<time>` as the number of
@@ -184,7 +184,7 @@ by users who are located in the same location and timezone. In this
184 case a reasonable offset from UTC could be assumed.
185 +
186 Unlike the `rfc2822` format, this format is very strict. Any
187 -variation in formatting will cause gfi to reject the value.
187 +variation in formatting will cause fast-import to reject the value.
188
189 `rfc2822`::
190 This is the standard email format as described by RFC 2822.
@@ -206,7 +206,7 @@ value to UTC prior to storage. Therefore it is important that
206 this information be as accurate as possible.
207 +
208 If the source material uses RFC 2822 style dates,
209 -the frontend should let gfi handle the parsing and conversion
209 +the frontend should let fast-import handle the parsing and conversion
210 (rather than attempting to do it itself) as the Git parser has
211 been well tested in the wild.
212 +
@@ -221,7 +221,7 @@ ambiguity in parsing.
221 +
222 This is a toy format. The current time and timezone of this system
223 is always copied into the identity string at the time it is being
224 -created by gfi. There is no way to specify a different time or
224 +created by fast-import. There is no way to specify a different time or
225 timezone.
226 +
227 This particular format is supplied as its short to implement and
@@ -238,7 +238,7 @@ date format other than `now`.
238
239 Commands
240 ~~~~~~~~
241 -gfi accepts several commands to update the current repository
241 +fast-import accepts several commands to update the current repository
242 and control the current import process. More detailed discussion
243 (with examples) of each command follows later.
244
@@ -264,7 +264,7 @@ and control the current import process. More detailed discussion
264 needed to perform an import.
265
266 `checkpoint`::
267 - Forces gfi to close the current packfile, generate its
267 + Forces fast-import to close the current packfile, generate its
268 unique SHA-1 checksum and index, and start a new packfile.
269 This command is optional and is not needed to perform
270 an import.
@@ -293,7 +293,7 @@ Git, so importing the CVS branch symbol `RELENG-1_0` would use
293 `<ref>` must be a valid refname in Git. As `LF` is not valid in
294 a Git refname, no quoting or escaping syntax is supported here.
295
296 -A `mark` command may optionally appear, requesting gfi to save a
296 +A `mark` command may optionally appear, requesting fast-import to save a
297 reference to the newly created commit for future use by the frontend
298 (see below for format). It is very common for frontends to mark
299 every commit they create, thereby allowing future branch creation
@@ -303,7 +303,7 @@ The `data` command following `committer` must supply the commit
303 message (see below for `data` command syntax). To import an empty
304 commit message use a 0 length data. Commit messages are free-form
305 and are not interpreted by Git. Currently they must be encoded in
306 -UTF-8, as gfi does not permit other encodings to be specified.
306 +UTF-8, as fast-import does not permit other encodings to be specified.
307
308 Zero or more `filemodify`, `filedelete` and `filedeleteall` commands
309 may be included to update the contents of the branch prior to
@@ -316,7 +316,7 @@ wipes the branch clean (see below).
316 ^^^^^^^^
317 An `author` command may optionally appear, if the author information
318 might differ from the committer information. If `author` is omitted
319 -then gfi will automatically use the committer's information for
319 +then fast-import will automatically use the committer's information for
320 the author portion of the commit. See below for a description of
321 the fields in `author`, as they are identical to `committer`.
322
@@ -341,12 +341,12 @@ their syntax.
341 `from`
342 ^^^^^^
343 Only valid for the first commit made on this branch by this
344 -gfi process. The `from` command is used to specify the commit
344 +fast-import process. The `from` command is used to specify the commit
345 to initialize this branch from. This revision will be the first
346 ancestor of the new commit.
347
348 Omitting the `from` command in the first commit of a new branch will
349 -cause gfi to create that commit with no ancestor. This tends to be
349 +cause fast-import to create that commit with no ancestor. This tends to be
350 desired only for the initial commit of a project. Omitting the
351 `from` command on existing branches is required, as the current
352 commit on that branch is automatically assumed to be the first
@@ -357,13 +357,13 @@ quoting or escaping syntax is supported within `<committish>`.
357
358 Here `<committish>` is any of the following:
359
360 -* The name of an existing branch already in gfi's internal branch
361 - table. If gfi doesn't know the name, its treated as a SHA-1
360 +* The name of an existing branch already in fast-import's internal branch
361 + table. If fast-import doesn't know the name, its treated as a SHA-1
362 expression.
363
364 * A mark reference, `:<idnum>`, where `<idnum>` is the mark number.
365 +
366 -The reason gfi uses `:` to denote a mark reference is this character
366 +The reason fast-import uses `:` to denote a mark reference is this character
367 is not legal in a Git branch name. The leading `:` makes it easy
368 to distingush between the mark 42 (`:42`) and the branch 42 (`42`
369 or `refs/heads/42`), or an abbreviated SHA-1 which happened to
@@ -381,10 +381,10 @@ current branch value should be written as:
381 ----
382 from refs/heads/branch^0
383 ----
384 -The `{caret}0` suffix is necessary as gfi does not permit a branch to
384 +The `{caret}0` suffix is necessary as fast-import does not permit a branch to
385 start from itself, and the branch is created in memory before the
386 `from` command is even read from the input. Adding `{caret}0` will force
387 -gfi to resolve the commit through Git's revision parsing library,
387 +fast-import to resolve the commit through Git's revision parsing library,
388 rather than its internal branch table, thereby loading in the
389 existing value of the branch.
390
@@ -392,7 +392,7 @@ existing value of the branch.
392 ^^^^^^^
393 Includes one additional ancestor commit, and makes the current
394 commit a merge commit. An unlimited number of `merge` commands per
395 -commit are permitted by gfi, thereby establishing an n-way merge.
395 +commit are permitted by fast-import, thereby establishing an n-way merge.
396 However Git's other tools never create commits with more than 15
397 additional ancestors (forming a 16-way merge). For this reason
398 it is suggested that frontends do not use more than 15 `merge`
@@ -493,14 +493,14 @@ update the content.
493 Issuing a `filedeleteall` followed by the needed `filemodify`
494 commands to set the correct content will produce the same results
495 as sending only the needed `filemodify` and `filedelete` commands.
496 -The `filedeleteall` approach may however require gfi to use slightly
496 +The `filedeleteall` approach may however require fast-import to use slightly
497 more memory per active branch (less than 1 MiB for even most large
498 projects); so frontends that can easily obtain only the affected
499 paths for a commit are encouraged to do so.
500
501 `mark`
502 ~~~~~~
503 -Arranges for gfi to save a reference to the current object, allowing
503 +Arranges for fast-import to save a reference to the current object, allowing
504 the frontend to recall this object at a future point in time, without
505 knowing its SHA-1. Here the current object is the object creation
506 command the `mark` command appears within. This can be `commit`,
@@ -536,7 +536,7 @@ where `<name>` is the name of the tag to create.
536
537 Tag names are automatically prefixed with `refs/tags/` when stored
538 in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would
539 -use just `RELENG-1_0-FINAL` for `<name>`, and gfi will write the
539 +use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the
540 corresponding ref as `refs/tags/RELENG-1_0-FINAL`.
541
542 The value of `<name>` must be a valid refname in Git and therefore
@@ -553,13 +553,13 @@ The `data` command following `tagger` must supply the annotated tag
553 message (see below for `data` command syntax). To import an empty
554 tag message use a 0 length data. Tag messages are free-form and are
555 not interpreted by Git. Currently they must be encoded in UTF-8,
556 -as gfi does not permit other encodings to be specified.
556 +as fast-import does not permit other encodings to be specified.
557
558 -Signing annotated tags during import from within gfi is not
558 +Signing annotated tags during import from within fast-import is not
559 supported. Trying to include your own PGP/GPG signature is not
560 recommended, as the frontend does not (easily) have access to the
561 complete set of bytes which normally goes into such a signature.
562 -If signing is required, create lightweight tags from within gfi with
562 +If signing is required, create lightweight tags from within fast-import with
563 `reset`, then create the annotated versions of those tags offline
564 with the standard gitlink:git-tag[1] process.
565
@@ -611,11 +611,11 @@ however, as marks are inexpensive to store and easy to use.
611 `data`
612 ~~~~~~
613 Supplies raw data (for use as blob/file content, commit messages, or
614 -annotated tag messages) to gfi. Data can be supplied using an exact
614 +annotated tag messages) to fast-import. Data can be supplied using an exact
615 byte count or delimited with a terminating line. Real frontends
616 intended for production-quality conversions should always use the
617 exact byte count format, as it is more robust and performs better.
618 -The delimited format is intended primarily for testing gfi.
618 +The delimited format is intended primarily for testing fast-import.
619
620 Exact byte count format::
621 The frontend must specify the number of bytes of data.
@@ -632,7 +632,7 @@ included in `<count>` and will not be included in the imported data.
632
633 Delimited format::
634 A delimiter string is used to mark the end of the data.
635 - gfi will compute the length by searching for the delimiter.
635 + fast-import will compute the length by searching for the delimiter.
636 This format is primarly useful for testing and is not
637 recommended for real data.
638 +
@@ -644,14 +644,14 @@ Delimited format::
644 +
645 where `<delim>` is the chosen delimiter string. The string `<delim>`
646 must not appear on a line by itself within `<raw>`, as otherwise
647 -gfi will think the data ends earlier than it really does. The `LF`
647 +fast-import will think the data ends earlier than it really does. The `LF`
648 immediately trailing `<raw>` is part of `<raw>`. This is one of
649 the limitations of the delimited format, it is impossible to supply
650 a data chunk which does not have an LF as its last byte.
651
652 `checkpoint`
653 ~~~~~~~~~~~~
654 -Forces gfi to close the current packfile, start a new one, and to
654 +Forces fast-import to close the current packfile, start a new one, and to
655 save out all current branch refs, tags and marks.
656
657 ....
@@ -659,9 +659,9 @@ save out all current branch refs, tags and marks.
659 LF
660 ....
661
662 -Note that gfi automatically switches packfiles when the current
662 +Note that fast-import automatically switches packfiles when the current
663 packfile reaches \--max-pack-size, or 4 GiB, whichever limit is
664 -smaller. During an automatic packfile switch gfi does not update
664 +smaller. During an automatic packfile switch fast-import does not update
665 the branch refs, tags or marks.
666
667 As a `checkpoint` can require a significant amount of CPU time and
@@ -672,37 +672,37 @@ several minutes for a single `checkpoint` command to complete.
672 Frontends may choose to issue checkpoints during extremely large
673 and long running imports, or when they need to allow another Git
674 process access to a branch. However given that a 30 GiB Subversion
675 -repository can be loaded into Git through gfi in about 3 hours,
675 +repository can be loaded into Git through fast-import in about 3 hours,
676 explicit checkpointing may not be necessary.
677
678
679 Tips and Tricks
680 ---------------
681 The following tips and tricks have been collected from various
682 -users of gfi, and are offered here as suggestions.
682 +users of fast-import, and are offered here as suggestions.
683
684 Use One Mark Per Commit
685 ~~~~~~~~~~~~~~~~~~~~~~~
686 When doing a repository conversion, use a unique mark per commit
687 (`mark :<n>`) and supply the \--export-marks option on the command
688 -line. gfi will dump a file which lists every mark and the Git
688 +line. fast-import will dump a file which lists every mark and the Git
689 object SHA-1 that corresponds to it. If the frontend can tie
690 the marks back to the source repository, it is easy to verify the
691 accuracy and completeness of the import by comparing each Git
692 commit to the corresponding source revision.
693
694 Coming from a system such as Perforce or Subversion this should be
695 -quite simple, as the gfi mark can also be the Perforce changeset
695 +quite simple, as the fast-import mark can also be the Perforce changeset
696 number or the Subversion revision number.
697
698 Freely Skip Around Branches
699 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
700 Don't bother trying to optimize the frontend to stick to one branch
701 at a time during an import. Although doing so might be slightly
702 -faster for gfi, it tends to increase the complexity of the frontend
702 +faster for fast-import, it tends to increase the complexity of the frontend
703 code considerably.
704
705 -The branch LRU builtin to gfi tends to behave very well, and the
705 +The branch LRU builtin to fast-import tends to behave very well, and the
706 cost of activating an inactive branch is so low that bouncing around
707 between branches has virtually no impact on import performance.
708
@@ -714,7 +714,7 @@ tags which are a subset of the files available in the repository.
714
715 Importing these tags as-is in Git is impossible without making at
716 least one commit which ``fixes up'' the files to match the content
717 -of the tag. Use gfi's `reset` command to reset a dummy branch
717 +of the tag. Use fast-import's `reset` command to reset a dummy branch
718 outside of your normal branch space to the base commit for the tag,
719 then commit one or more file fixup commits, and finally tag the
720 dummy branch.
@@ -731,12 +731,12 @@ Doing so will allow tools such as gitlink:git-blame[1] to track
731 through the real commit history and properly annotate the source
732 files.
733
734 -After gfi terminates the frontend will need to do `rm .git/TAG_FIXUP`
734 +After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP`
735 to remove the dummy branch.
736
737 Import Now, Repack Later
738 ~~~~~~~~~~~~~~~~~~~~~~~~
739 -As soon as gfi completes the Git repository is completely valid
739 +As soon as fast-import completes the Git repository is completely valid
740 and ready for use. Typicallly this takes only a very short time,
741 even for considerably large projects (100,000+ commits).
742
@@ -748,7 +748,7 @@ run the repack in the background and let it finish when it finishes.
748 There is no reason to wait to explore your new Git project!
749
750 If you choose to wait for the repack, don't try to run benchmarks
751 -or performance tests until repacking is completed. gfi outputs
751 +or performance tests until repacking is completed. fast-import outputs
752 suboptimal packfiles that are simply never seen in real use
753 situations.
754
@@ -764,7 +764,7 @@ project will benefit from the smaller repository.
764
765 Packfile Optimization
766 ---------------------
767 -When packing a blob gfi always attempts to deltify against the last
767 +When packing a blob fast-import always attempts to deltify against the last
768 blob written. Unless specifically arranged for by the frontend,
769 this will probably not be a prior version of the same file, so the
770 generated delta will not be the smallest possible. The resulting
@@ -773,20 +773,20 @@ packfile will be compressed, but will not be optimal.
773 Frontends which have efficient access to all revisions of a
774 single file (for example reading an RCS/CVS ,v file) can choose
775 to supply all revisions of that file as a sequence of consecutive
776 -`blob` commands. This allows gfi to deltify the different file
776 +`blob` commands. This allows fast-import to deltify the different file
777 revisions against each other, saving space in the final packfile.
778 Marks can be used to later identify individual file revisions during
779 a sequence of `commit` commands.
780
781 -The packfile(s) created by gfi do not encourage good disk access
782 -patterns. This is caused by gfi writing the data in the order
781 +The packfile(s) created by fast-import do not encourage good disk access
782 +patterns. This is caused by fast-import writing the data in the order
783 it is received on standard input, while Git typically organizes
784 data within packfiles to make the most recent (current tip) data
785 appear before historical data. Git also clusters commits together,
786 speeding up revision traversal through better cache locality.
787
788 For this reason it is strongly recommended that users repack the
789 -repository with `git repack -a -d` after gfi completes, allowing
789 +repository with `git repack -a -d` after fast-import completes, allowing
790 Git to reorganize the packfiles for faster data access. If blob
791 deltas are suboptimal (see above) then also adding the `-f` option
792 to force recomputation of all deltas can significantly reduce the
@@ -795,23 +795,23 @@ final packfile size (30-50% smaller can be quite typical).
795
796 Memory Utilization
797 ------------------
798 -There are a number of factors which affect how much memory gfi
798 +There are a number of factors which affect how much memory fast-import
799 requires to perform an import. Like critical sections of core
800 -Git, gfi uses its own memory allocators to ammortize any overheads
801 -associated with malloc. In practice gfi tends to ammoritize any
800 +Git, fast-import uses its own memory allocators to ammortize any overheads
801 +associated with malloc. In practice fast-import tends to ammoritize any
802 malloc overheads to 0, due to its use of large block allocations.
803
804 per object
805 ~~~~~~~~~~
806 -gfi maintains an in-memory structure for every object written in
806 +fast-import maintains an in-memory structure for every object written in
807 this execution. On a 32 bit system the structure is 32 bytes,
808 on a 64 bit system the structure is 40 bytes (due to the larger
809 pointer sizes). Objects in the table are not deallocated until
810 -gfi terminates. Importing 2 million objects on a 32 bit system
810 +fast-import terminates. Importing 2 million objects on a 32 bit system
811 will require approximately 64 MiB of memory.
812
813 The object table is actually a hashtable keyed on the object name
814 -(the unique SHA-1). This storage configuration allows gfi to reuse
814 +(the unique SHA-1). This storage configuration allows fast-import to reuse
815 an existing or already written object and avoid writing duplicates
816 to the output packfile. Duplicate blobs are surprisingly common
817 in an import, typically due to branch merges in the source.
@@ -831,7 +831,7 @@ of the two classes is significantly different.
831
832 Inactive branches are stored in a structure which uses 96 or 120
833 bytes (32 bit or 64 bit systems, respectively), plus the length of
834 -the branch name (typically under 200 bytes), per branch. gfi will
834 +the branch name (typically under 200 bytes), per branch. fast-import will
835 easily handle as many as 10,000 inactive branches in under 2 MiB
836 of memory.
837
@@ -846,7 +846,7 @@ As active branches store metadata about the files contained on that
846 branch, their in-memory storage size can grow to a considerable size
847 (see below).
848
849 -gfi automatically moves active branches to inactive status based on
849 +fast-import automatically moves active branches to inactive status based on
850 a simple least-recently-used algorithm. The LRU chain is updated on
851 each `commit` command. The maximum number of active branches can be
852 increased or decreased on the command line with \--active-branches=.
@@ -867,7 +867,7 @@ tree names are pooled in a common string table, allowing the filename
867 overhead) no matter how many times it occurs within the project.
868
869 The active branch LRU, when coupled with the filename string pool
870 -and lazy loading of subtrees, allows gfi to efficiently import
870 +and lazy loading of subtrees, allows fast-import to efficiently import
871 projects with 2,000+ branches and 45,114+ files in a very limited
872 memory footprint (less than 2.7 MiB per active branch).
873