diff options
Diffstat (limited to 'man1/git-fast-import.1')
| -rw-r--r-- | man1/git-fast-import.1 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 79a343cc3..53f8e9c24 100644 --- a/man1/git-fast-import.1 +++ b/man1/git-fast-import.1 @@ -2,12 +2,12 @@ .\" Title: git-fast-import .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -678,7 +678,7 @@ or .sp -1 .IP \(bu 2.3 .\} -\fB160000\fR: A gitlink, SHA\-1 of the object refers to a commit in another repository\&. Git links can only be specified by SHA or through a commit mark\&. They are used to implement submodules\&. +\fB160000\fR: A gitlink, SHA\-1 of the object refers to a commit in another repository\&. Git links can only be specified either by SHA or through a commit mark\&. They are used to implement submodules\&. .RE .sp .RS 4 @@ -1597,7 +1597,7 @@ The following tips and tricks have been collected from various users of fast\-im .sp When doing a repository conversion, use a unique mark per commit (\fBmark :<n>\fR) and supply the \-\-export\-marks option on the command 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 the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision\&. .sp -Coming from a system such as Perforce or Subversion this should be quite simple, as the fast\-import mark can also be the Perforce changeset number or the Subversion revision number\&. +Coming from a system such as Perforce or Subversion, this should be quite simple, as the fast\-import mark can also be the Perforce changeset number or the Subversion revision number\&. .SS "Freely Skip Around Branches" .sp Don\(cqt bother trying to optimize the frontend to stick to one branch at a time during an import\&. Although doing so might be slightly faster for fast\-import, it tends to increase the complexity of the frontend code considerably\&. @@ -1682,7 +1682,7 @@ fastimport\&.unpackLimit .RS 4 If the number of objects imported by \fBgit-fast-import\fR(1) -is below this limit, then the objects will be unpacked into loose object files\&. However if the number of imported objects equals or exceeds this limit then the pack will be stored as a pack\&. Storing the pack from a fast\-import can make the import operation complete faster, especially on slow filesystems\&. If not set, the value of +is below this limit, then the objects will be unpacked into loose object files\&. However, if the number of imported objects equals or exceeds this limit, then the pack will be stored as a pack\&. Storing the pack from a fast\-import can make the import operation complete faster, especially on slow filesystems\&. If not set, the value of \fBtransfer\&.unpackLimit\fR is used instead\&. .RE |