diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 14:31:57 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 14:31:57 -0800 |
commit | de48f457367f37c28229ebe8e6cef849dd6e430a (patch) | |
tree | c0e656a1b610026344048379922f2fd2df8d549f /git-fast-import.html | |
parent | 2e1a9d9baa0719a5a67da9c049bffc04c23272bd (diff) | |
download | git-htmldocs-de48f457367f37c28229ebe8e6cef849dd6e430a.tar.gz |
Autogenerated HTML docs for v2.20.1-98-gecbdaf
Diffstat (limited to 'git-fast-import.html')
-rw-r--r-- | git-fast-import.html | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/git-fast-import.html b/git-fast-import.html index 121f3a73d..b4007efa2 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -792,9 +792,10 @@ the frontend program in use.</p></div> </dt>
<dd>
<p>
- Disable all non-fatal output, making fast-import silent when it
- is successful. This option disables the output shown by
- --stats.
+ Disable the output shown by --stats, making fast-import usually
+ be silent when it is successful. However, if the import stream
+ has directives intended to show user output (e.g. <code>progress</code>
+ directives), the corresponding messages will still be shown.
</p>
</dd>
<dt class="hdlist1">
@@ -1282,6 +1283,7 @@ change to the project.</p></div> <div class="content">
<pre><code> 'commit' SP <ref> LF
mark?
+ original-oid?
('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
data
@@ -1683,6 +1685,18 @@ to another object simply by reusing the same <code><idnum></code> in anoth <code>mark</code> command.</p></div>
</div>
<div class="sect2">
+<h3 id="_code_original_oid_code"><code>original-oid</code></h3>
+<div class="paragraph"><p>Provides the name of the object in the original source control system.
+fast-import will simply ignore this directive, but filter processes
+which operate on and modify the stream before feeding to fast-import
+may have uses for this information</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code> 'original-oid' SP <object-identifier> LF</code></pre>
+</div></div>
+<div class="paragraph"><p>where <code><object-identifer></code> is any string not containing LF.</p></div>
+</div>
+<div class="sect2">
<h3 id="_code_tag_code"><code>tag</code></h3>
<div class="paragraph"><p>Creates an annotated tag referring to a specific commit. To create
lightweight (non-annotated) tags see the <code>reset</code> command below.</p></div>
@@ -1690,6 +1704,7 @@ lightweight (non-annotated) tags see the <code>reset</code> command below.</p></ <div class="content">
<pre><code> 'tag' SP <name> LF
'from' SP <commit-ish> LF
+ original-oid?
'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
data</code></pre>
</div></div>
@@ -1756,6 +1771,7 @@ assigned mark.</p></div> <div class="content">
<pre><code> 'blob' LF
mark?
+ original-oid?
data</code></pre>
</div></div>
<div class="paragraph"><p>The mark command is optional here as some frontends have chosen
@@ -2496,7 +2512,7 @@ compression.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2018-06-01 16:13:01 JST
+ 2019-01-04 14:31:36 PST
</div>
</div>
</body>
|