summaryrefslogtreecommitdiff
path: root/Documentation/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-08 13:21:07 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-08 13:21:07 -0800
commit2fa3335a267392ca84bf3c4a6fe5017fdb6bb4ef (patch)
treee7ed7e48d3e951e845a624a6574fb4e7261e5ed0 /Documentation/git-fast-import.txt
parent2d0029e38f3ecd355b403ffa8a75416129439185 (diff)
parent850bc56defe2abf68ce26c5c80761d3df59c2ba7 (diff)
downloadgit-2fa3335a267392ca84bf3c4a6fe5017fdb6bb4ef.tar.gz
Merge branch 'jk/maint-fast-import-doc-dedup-done'
* jk/maint-fast-import-doc-dedup-done: git-fast-import(1): remove duplicate '--done' option
Diffstat (limited to 'Documentation/git-fast-import.txt')
-rw-r--r--Documentation/git-fast-import.txt7
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 68bca1a29d..3da5cc272a 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/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.