summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-03-09 09:06:40 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-03-09 09:06:40 +0000
commitd15328acbacd5d5b1b56a7ee143ccf7db9e7549e (patch)
treeaeec40df3d7a5c5c3f802f9dfc6e387fc65adf68 /git-fast-import.txt
parentabcd65d67e1430fd2ac0634681a0bf1587c039b0 (diff)
downloadgit-htmldocs-d15328acbacd5d5b1b56a7ee143ccf7db9e7549e.tar.gz
Autogenerated HTML docs for v1.5.0.3-316-gbd1fc
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt13
1 files changed, 12 insertions, 1 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index 77a14bb07..7e3d2b1a9 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -62,7 +62,18 @@ OPTIONS
Dumps the internal marks table to <file> when complete.
Marks are written one per line as `:markid SHA-1`.
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.
+
+--import-marks=<file>::
+ 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.
--export-pack-edges=<file>::
After creating a packfile, print a line of data to