Skip to content

Commit

Permalink
Merge branch 'er/doc-fast-import-done' into maint
Browse files Browse the repository at this point in the history
* er/doc-fast-import-done:
  fast-import: document the --done option
  • Loading branch information
Junio C Hamano committed Sep 18, 2012
2 parents 8ffc331 + 3266de1 commit 39e2e02
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Documentation/git-fast-import.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ OPTIONS
See ``Date Formats'' below for details about which formats
are supported, and their syntax.

-- done::
Terminate with error if there is no 'done' command at the
end of the stream.

--force::
Force updating modified existing branches, even if doing
so would cause commits to be lost (as the new commit does
Expand Down Expand Up @@ -1047,7 +1051,9 @@ done::
Error out if the stream ends without a 'done' command.
Without this feature, errors causing the frontend to end
abruptly at a convenient point in the stream can go
undetected.
undetected. This may occur, for example, if an import
front end dies in mid-operation without emitting SIGTERM
or SIGKILL at its subordinate git fast-import instance.

`option`
~~~~~~~~
Expand Down

0 comments on commit 39e2e02

Please sign in to comment.