summaryrefslogtreecommitdiffstats
path: root/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-08 16:15:42 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-08 16:15:42 -0800
commit6bdcc7d8e5f8044eabad26e884e4d2157d169c7b (patch)
treee824fff51cd09e134ebb34a1b8f83dcb545b7481 /git-fast-import.txt
parenteec745b5e346474e9c30341545d5e014d856690b (diff)
downloadgit-htmldocs-6bdcc7d8e5f8044eabad26e884e4d2157d169c7b.tar.gz
Autogenerated HTML docs for v1.8.1-191-g414c7
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r--git-fast-import.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt
index 68bca1a29..3da5cc272 100644
--- a/git-fast-import.txt
+++ b/git-fast-import.txt
@@ -39,10 +39,6 @@ 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
@@ -108,7 +104,8 @@ OPTIONS
output.
--done::
- Require a `done` command at the end of the stream.
+ Terminate with error if there is no `done` command at the
+ end of the stream.
This option might be useful for detecting errors that
cause the frontend to terminate before it has started to
write a stream.