diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-08 10:10:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-08 10:10:05 +0300 |
| commit | f45fa2a073da591f3ac0b63900e07afa2dccee44 (patch) | |
| tree | 9d1a9d84921d63c61fabbaa4e5e6d1e4aef50d70 /Documentation | |
| parent | 05ef58ec1f2fb69d6e7ae7fca84163f75bd95050 (diff) | |
| parent | e8438420bb7d368bec3647b90c557b9931582267 (diff) | |
Merge branch 'master' of git://repo.or.cz/git/fastimport
* 'master' of git://repo.or.cz/git/fastimport:
Allow fast-import frontends to reload the marks table
Use atomic updates to the fast-import mark file
Preallocate memory earlier in fast-import
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 77a14bb076..7e3d2b1a96 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/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 |