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>

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 3e7e62057e9fd8236331f56309ced2e180d2d03d..47d71964a7353936389b451269eff7565782fb65 100644 (file)
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -38,10 +38,6 @@ OPTIONS
        See ``Date Formats'' below for details about which formats
        are supported, and their syntax.
 
        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
 --force::
        Force updating modified existing branches, even if doing
        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`.
 
 --done::
        The default behaviour is to write to `stdout`.
 
 --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.
        This option might be useful for detecting errors that
        cause the frontend to terminate before it has started to
        write a stream.