undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-fast-import(1): remove duplicate '--done' option

Browse Source 
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>
This commit is contained in:
John Keeping 2013-01-07 11:57:09 +00:00 committed by Junio C Hamano
parent 3266de1074
commit 850bc56def
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-fast-import.txt
View File

@ -38,10 +38,6 @@ OPTIONS
See ``Date Formats'' below for details about which formats See ``Date Formats'' below for details about which formats
are supported, and their syntax. are supported, and their syntax.
-- done::
Terminate with error if there is no 'done' command at the
end of the stream.
--force:: --force::
Force updating modified existing branches, even if doing Force updating modified existing branches, even if doing
so would cause commits to be lost (as the new commit does so would cause commits to be lost (as the new commit does
@ -106,7 +102,8 @@ OPTIONS
The default behaviour is to write to `stdout`. The default behaviour is to write to `stdout`.
--done:: --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 This option might be useful for detecting errors that
cause the frontend to terminate before it has started to cause the frontend to terminate before it has started to
write a stream. write a stream.