summaryrefslogtreecommitdiffstats
path: root/git-fast-import.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:54 -0700
commit33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch)
tree4a681cad5c6da23a7d7f56022666fb31397026d2 /git-fast-import.html
parent359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff)
downloadgit-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz
Autogenerated HTML docs for v2.42.0-482-g2e8e7
Diffstat (limited to 'git-fast-import.html')
-rw-r--r--git-fast-import.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-fast-import.html b/git-fast-import.html
index db44a65ee..a7047a374 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1570,7 +1570,7 @@ in octal. Git only supports the following modes:</p></div>
<li>
<p>
<code>160000</code>: A gitlink, SHA-1 of the object refers to a commit in
- another repository. Git links can only be specified by SHA or through
+ another repository. Git links can only be specified either by SHA or through
a commit mark. They are used to implement submodules.
</p>
</li>
@@ -2398,7 +2398,7 @@ 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.</p></div>
-<div class="paragraph"><p>Coming from a system such as Perforce or Subversion this should be
+<div class="paragraph"><p>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.</p></div>
</div>
@@ -2613,8 +2613,8 @@ fastimport.unpackLimit
<p>
If the number of objects imported by <a href="git-fast-import.html">git-fast-import(1)</a>
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
+ 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 <code>transfer.unpackLimit</code> is used instead.
@@ -2640,7 +2640,7 @@ fastimport.unpackLimit
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-10-23 14:43:46 PDT
</div>
</div>
</body>