diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2012-08-22 06:57:05 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-22 11:15:16 -0700 |
| commit | 3266de10747c4ad3fa972994004fcb0fca9ebe1f (patch) | |
| tree | c2d524aa07554a2964e241d9cfbcbfe179b35156 /Documentation/git-fast-import.txt | |
| parent | be56862f198d946dc75ac7092606e78a4f2ff1d3 (diff) | |
| download | git-3266de10747c4ad3fa972994004fcb0fca9ebe1f.tar.gz | |
fast-import: document the --done option
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 0fc68a911e..3e7e62057e 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -38,6 +38,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 @@ -1030,7 +1034,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` ~~~~~~~~ |