John KeepingThe "--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> --- I'm guessing that the reason the option was documented again (in commit 3266de10) is because the options are not in an obvious order. There does seem to be some grouping of the options by type, but without subheadings I wonder if it would make more sense to just put them all in alphabetical order?
Documentation/git-fast-import.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
Show changes to Documentation/git-fast-import.txt +2 −4
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 68bca1a..4ef5721 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.
-- 1.8.0.2
