Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint

* jk/maint-fast-import-doc-dedup-done:
  git-fast-import(1): remove duplicate '--done' option

diff --cc Documentation/git-fast-import.txt
index 68bca1a29de51995881edae077c8232bcdb1f07a,47d71964a7353936389b451269eff7565782fb65..3da5cc272a7aac921017fead83c271b5d35fd977
--- 1/Documentation/git-fast-import.txt
--- 2/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -102,13 -97,13 +98,14 @@@ OPTION
        options.
  
  --cat-blob-fd=<fd>::
 -      Specify the file descriptor that will be written to
 -      when the `cat-blob` command is encountered in the stream.
 -      The default behaviour is to write to `stdout`.
 +      Write responses to `cat-blob` and `ls` queries to the
 +      file descriptor <fd> instead of `stdout`.  Allows `progress`
 +      output intended for the end-user to be separated from other
 +      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.