Autogenerated HTML docs for v1.6.6-243-gff6d2

1 files changed, 131 insertions, 1 deletions

diff --git a/git-fast-import.html b/git-fast-import.html
index cc162a200..4f0164c30 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -421,6 +421,30 @@ the frontend program in use.</p></div>
 </p>

 </dd>

 <dt>

+--relative-marks

+</dt>

+<dd>

+<p>

+        After specifying --relative-marks= the paths specified

+        with --import-marks= and --export-marks= are relative

+        to an internal directory in the current repository.

+        In git-fast-import this means that the paths are relative

+        to the .git/info/fast-import directory. However, other

+        importers may use a different location.

+</p>

+</dd>

+<dt>

+--no-relative-marks

+</dt>

+<dd>

+<p>

+        Negates a previous --relative-marks. Allows for combining

+        relative and non-relative marks by interweaving

+        --(no-)-relative-marks= with the --(import|export)-marks=

+        options.

+</p>

+</dd>

+<dt>

 --export-pack-edges=&lt;file&gt;

 </dt>

 <dd>

@@ -685,6 +709,25 @@ and control the current import process.  More detailed discussion
         to perform an import.

 </p>

 </dd>

+<dt>

+<tt>feature</tt>

+</dt>

+<dd>

+<p>

+        Require that fast-import supports the specified feature, or

+        abort if it does not.

+</p>

+</dd>

+<dt>

+<tt>option</tt>

+</dt>

+<dd>

+<p>

+        Specify any of the options listed under OPTIONS that do not

+        change stream semantic to suit the frontend's needs. This

+        command is optional and is not needed to perform an import.

+</p>

+</dd>

 </dl></div>

 <h3 id="_tt_commit_tt"><tt>commit</tt></h3><div style="clear:left"></div>

 <div class="para"><p>Create or update a branch with a new commit, recording one logical

@@ -1226,6 +1269,93 @@ remove the leading part of the line, for example:</p></div>
 <div class="para"><p>Placing a <tt>progress</tt> command immediately after a <tt>checkpoint</tt> will

 inform the reader when the <tt>checkpoint</tt> has been completed and it

 can safely access the refs that fast-import updated.</p></div>

+<h3 id="_tt_feature_tt"><tt>feature</tt></h3><div style="clear:left"></div>

+<div class="para"><p>Require that fast-import supports the specified feature, or abort if

+it does not.</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><tt>        'feature' SP &lt;feature&gt; LF</tt></pre>

+</div></div>

+<div class="para"><p>The &lt;feature&gt; part of the command may be any string matching

+^[a-zA-Z][a-zA-Z-]*$ and should be understood by fast-import.</p></div>

+<div class="para"><p>Feature work identical as their option counterparts with the

+exception of the import-marks feature, see below.</p></div>

+<div class="para"><p>The following features are currently supported:</p></div>

+<div class="ilist"><ul>

+<li>

+<p>

+date-format

+</p>

+</li>

+<li>

+<p>

+import-marks

+</p>

+</li>

+<li>

+<p>

+export-marks

+</p>

+</li>

+<li>

+<p>

+relative-marks

+</p>

+</li>

+<li>

+<p>

+no-relative-marks

+</p>

+</li>

+<li>

+<p>

+force

+</p>

+</li>

+</ul></div>

+<div class="para"><p>The import-marks behaves differently from when it is specified as

+commandline option in that only one "feature import-marks" is allowed

+per stream. Also, any --import-marks= specified on the commandline

+will override those from the stream (if any).</p></div>

+<h3 id="_tt_option_tt"><tt>option</tt></h3><div style="clear:left"></div>

+<div class="para"><p>Processes the specified option so that git fast-import behaves in a

+way that suits the frontend's needs.

+Note that options specified by the frontend are overridden by any

+options the user may specify to git fast-import itself.</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><tt>    'option' SP &lt;option&gt; LF</tt></pre>

+</div></div>

+<div class="para"><p>The <tt>&lt;option&gt;</tt> part of the command may contain any of the options

+listed in the OPTIONS section that do not change import semantics,

+without the leading <em>--</em> and is treated in the same way.</p></div>

+<div class="para"><p>Option commands must be the first commands on the input (not counting

+feature commands), to give an option command after any non-option

+command is an error.</p></div>

+<div class="para"><p>The following commandline options change import semantics and may therefore

+not be passed as option:</p></div>

+<div class="ilist"><ul>

+<li>

+<p>

+date-format

+</p>

+</li>

+<li>

+<p>

+import-marks

+</p>

+</li>

+<li>

+<p>

+export-marks

+</p>

+</li>

+<li>

+<p>

+force

+</p>

+</li>

+</ul></div>

 </div>

 <h2 id="_crash_reports">Crash Reports</h2>

 <div class="sectionbody">

@@ -1511,7 +1641,7 @@ memory footprint (less than 2.7 MiB per active branch).</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-01-01 00:02:32 UTC

+Last updated 2010-01-18 01:25:21 UTC

 </div>

 </div>

 </body>