summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-18 15:30:42 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-18 15:30:42 -0700
commit8ce35d7cc1d82c9267b88efee4c3e81f0c6b3b9f (patch)
tree64cb83951d10712261e23b8b91ec2d039f4c2b17 /git-fast-import.txt
parent281fd394a268e17e15f0869620a8f8fcaf28fbd1 (diff)
downloadgit-htmldocs-8ce35d7cc1d82c9267b88efee4c3e81f0c6b3b9f.tar.gz
Autogenerated HTML docs for v1.7.12.1-382-gb0576
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index 2620d28b4..6603a7ab7 100644
--- a/git-fast-import.txt
+++ b/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`
~~~~~~~~