diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-03-09 09:06:40 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-03-09 09:06:40 +0000 |
| commit | d15328acbacd5d5b1b56a7ee143ccf7db9e7549e (patch) | |
| tree | aeec40df3d7a5c5c3f802f9dfc6e387fc65adf68 /git-fast-import.html | |
| parent | abcd65d67e1430fd2ac0634681a0bf1587c039b0 (diff) | |
| download | git-htmldocs-d15328acbacd5d5b1b56a7ee143ccf7db9e7549e.tar.gz | |
Autogenerated HTML docs for v1.5.0.3-316-gbd1fc
Diffstat (limited to 'git-fast-import.html')
| -rw-r--r-- | git-fast-import.html | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/git-fast-import.html b/git-fast-import.html index 5d50a332d..6ff782cf3 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -353,7 +353,23 @@ the frontend program in use.</p> Dumps the internal marks table to <file> when complete.
Marks are written one per line as <tt>:markid SHA-1</tt>.
Frontends can use this file to validate imports after they
- have been completed.
+ have been completed, or to save the marks table across
+ incremental runs. As <file> is only opened and truncated
+ at checkpoint (or completion) the same path can also be
+ safely given to --import-marks.
+</p>
+</dd>
+<dt>
+--import-marks=<file>
+</dt>
+<dd>
+<p>
+ Before processing any input, load the marks specified in
+ <file>. The input file must exist, must be readable, and
+ must use the same format as produced by --export-marks.
+ Multiple options may be supplied to import more than one
+ set of marks. If a mark is defined to different values,
+ the last file wins.
</p>
</dd>
<dt>
@@ -1188,7 +1204,7 @@ memory footprint (less than 2.7 MiB per active branch).</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 14-Feb-2007 07:23:34 UTC
+Last updated 09-Mar-2007 09:06:22 UTC
</div>
</div>
</body>
|