Merge branch 'jk/maint-fast-import-doc-dedup-done'
The "logical order" reorganization can come after that is done and can cook longer in 'next'. * jk/maint-fast-import-doc-dedup-done: git-fast-import(1): remove duplicate '--done' option
This commit is contained in:
commit
572b528217
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user