Browse Source

Merge branch 'er/doc-fast-import-done' into maint

* er/doc-fast-import-done:
  fast-import: document the --done option
maint
Junio C Hamano 12 years ago
parent
commit
39e2e02060
  1. 8
      Documentation/git-fast-import.txt

8
Documentation/git-fast-import.txt

@ -39,6 +39,10 @@ OPTIONS @@ -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
@ -1047,7 +1051,9 @@ done:: @@ -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`
~~~~~~~~

Loading…
Cancel
Save