Skip to content

Commit 39e2e02

Browse files
committed
Merge branch 'er/doc-fast-import-done' into maint
* er/doc-fast-import-done: fast-import: document the --done option
2 parents 8ffc331 + 3266de1 commit 39e2e02

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Documentation/git-fast-import.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ OPTIONS
3939
See ``Date Formats'' below for details about which formats
4040
are supported, and their syntax.
4141

42+
-- done::
43+
Terminate with error if there is no 'done' command at the
44+
end of the stream.
45+
4246
--force::
4347
Force updating modified existing branches, even if doing
4448
so would cause commits to be lost (as the new commit does
@@ -1047,7 +1051,9 @@ done::
10471051
Error out if the stream ends without a 'done' command.
10481052
Without this feature, errors causing the frontend to end
10491053
abruptly at a convenient point in the stream can go
1050-
undetected.
1054+
undetected. This may occur, for example, if an import
1055+
front end dies in mid-operation without emitting SIGTERM
1056+
or SIGKILL at its subordinate git fast-import instance.
10511057

10521058
`option`
10531059
~~~~~~~~

0 commit comments

Comments
 (0)