git-fast-import(1): remove duplicate '--done' option
The '--done' option to git-fast-import is documented twice in its manual page. Combine the best bits of each description, keeping the location of the instance that was added first. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Jan 7, 2013 at 11:57 UTC
850bc56defe2abf68ce26c5c80761d3df59c2ba7
1 file changed
+2
-4
Documentation/git-fast-import.txt
renamed
+2
-4
@@ -38,10 +38,6 @@ OPTIONS
38
See ``Date Formats'' below for details about which formats
39
are supported, and their syntax.
40
41
- Terminate with error if there is no 'done' command at the
42
- end of the stream.
43
-
41
--force::
42
Force updating modified existing branches, even if doing
43
so would cause commits to be lost (as the new commit does
@@ -106,7 +102,8 @@ OPTIONS
102
The default behaviour is to write to `stdout`.
103
104
--done::
109
- Require a `done` command at the end of the stream.
105
+ Terminate with error if there is no `done` command at the
106
+ end of the stream.
107
This option might be useful for detecting errors that
108
cause the frontend to terminate before it has started to
109
write a stream.