diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:33:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:33:52 -0700 |
| commit | 39e2e020608716e8710ff391e0d2b6d035cb3dd6 (patch) | |
| tree | 8f870cb139e42b9cd690d845f9acf6298caced55 /Documentation/git-fast-import.txt | |
| parent | 8ffc33135268aaac55d08f4261d63b01b1004fb4 (diff) | |
| parent | 3266de10747c4ad3fa972994004fcb0fca9ebe1f (diff) | |
| download | git-39e2e020608716e8710ff391e0d2b6d035cb3dd6.tar.gz | |
Merge branch 'er/doc-fast-import-done' into maint
* er/doc-fast-import-done:
fast-import: document the --done option
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 2620d28b4b..6603a7ab73 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -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:: 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` ~~~~~~~~ |