From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Jan 2013 15:48:39 +0000 (-0800)
Subject: Merge branch 'jk/maint-fast-import-doc-dedup-done' into maint
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b9ea42b3cb91cc5463ac73610dbc3285e20b400;p=git.git

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
---

7b9ea42b3cb91cc5463ac73610dbc3285e20b400
diff --cc Documentation/git-fast-import.txt
index 68bca1a29,47d71964a..3da5cc272
--- a/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.