diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-15 14:24:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 14:24:40 +0900 |
| commit | fa2a48b86c2f25f536c882f5cf012000e38315c3 (patch) | |
| tree | fa99033a1dad567ae85b6ad3ea4627375adf217f /git-fast-import.html | |
| parent | 6c6b0e5a189ca5f922b8d1535d0795a34176a1a1 (diff) | |
| download | git-htmldocs-fa2a48b86c2f25f536c882f5cf012000e38315c3.tar.gz | |
Autogenerated HTML docs for v2.23.0-715-g108b9
Diffstat (limited to 'git-fast-import.html')
| -rw-r--r-- | git-fast-import.html | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/git-fast-import.html b/git-fast-import.html index 93e626ec5..92f9155c5 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1194,6 +1194,18 @@ and control the current import process. More detailed discussion </p>
</dd>
<dt class="hdlist1">
+<code>alias</code>
+</dt>
+<dd>
+<p>
+ Record that a mark refers to a given object without first
+ creating any new object. Using --import-marks and referring
+ to missing marks will cause fast-import to fail, so aliases
+ can provide a way to set otherwise pruned commits to a valid
+ value (e.g. the nearest non-pruned ancestor).
+</p>
+</dd>
+<dt class="hdlist1">
<code>checkpoint</code>
</dt>
<dd>
@@ -1715,6 +1727,7 @@ lightweight (non-annotated) tags see the <code>reset</code> command below.</p></ <div class="literalblock">
<div class="content">
<pre><code> 'tag' SP <name> LF
+ mark?
'from' SP <commit-ish> LF
original-oid?
'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
@@ -1853,6 +1866,19 @@ a data chunk which does not have an LF as its last byte.</p></div> </dl></div>
</div>
<div class="sect2">
+<h3 id="_code_alias_code"><code>alias</code></h3>
+<div class="paragraph"><p>Record that a mark refers to a given object without first creating any
+new object.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code> 'alias' LF
+ mark
+ 'to' SP <commit-ish> LF
+ LF?</code></pre>
+</div></div>
+<div class="paragraph"><p>For a detailed description of <code><commit-ish></code> see above under <code>from</code>.</p></div>
+</div>
+<div class="sect2">
<h3 id="_code_checkpoint_code"><code>checkpoint</code></h3>
<div class="paragraph"><p>Forces fast-import to close the current packfile, start a new one, and to
save out all current branch refs, tags and marks.</p></div>
@@ -2529,7 +2555,7 @@ compression.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2019-08-23 05:34:29 JST
+ 2019-10-15 14:20:15 JST
</div>
</div>
</body>
|