diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:19 -0700 |
| commit | 96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb (patch) | |
| tree | 2d99b4b39a05bd23009a763d9ab602cca721bb45 /Documentation/git-fast-export.txt | |
| parent | 51f319c08f55beb12cf1e1d4db9299434b9b1496 (diff) | |
| parent | d0258b93e6eb95dd1169693dbcf12f0ae6f6a2eb (diff) | |
| download | git-96b7f93ac85ba09aaa82ecc86bf14cba481bbdbb.tar.xz | |
Merge branch 'jk/asciidoc-markup-fix' into maint
Various documentation mark-up fixes to make the output more
consistent in general and also make AsciiDoctor (an alternative
formatter) happier.
* jk/asciidoc-markup-fix:
doc: convert AsciiDoc {?foo} to ifdef::foo[]
doc: put example URLs and emails inside literal backticks
doc: drop backslash quoting of some curly braces
doc: convert \--option to --option
doc/add: reformat `--edit` option
doc: fix length of underlined section-title
doc: fix hanging "+"-continuation
doc: fix unquoted use of "{type}"
doc: fix misrendering due to `single quote'
Diffstat (limited to 'Documentation/git-fast-export.txt')
| -rw-r--r-- | Documentation/git-fast-export.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index 929e496af8..ed57c684db 100644 --- a/Documentation/git-fast-export.txt +++ b/Documentation/git-fast-export.txt @@ -67,17 +67,17 @@ produced incorrect results if you gave these options. have been completed, or to save the marks table across incremental runs. As <file> is only opened and truncated at completion, the same path can also be safely given to - \--import-marks. + --import-marks. The file will not be written if no new object has been marked/exported. --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. + must use the same format as produced by --export-marks. + Any commits that have already been marked will not be exported again. -If the backend uses a similar \--import-marks file, this allows for +If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs. |