From: Elijah Newren <newren@gmail.com>
Date: Fri, 16 Nov 2018 07:59:47 +0000 (-0800)
Subject: git-fast-import.txt: fix documentation for --quiet option
X-Git-Tag: v2.21.0-rc0~130^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f55c979b14eb7788fb5b4fe5e04212191b53e477?hp=843b9e6d488b430e76fdfdebad186070063a71ea

git-fast-import.txt: fix documentation for --quiet option

Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index e81117d27f..7ab97745a6 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -40,9 +40,10 @@ OPTIONS
 	not contain the old commit).
 
 --quiet::
-	Disable all non-fatal output, making fast-import silent when it
-	is successful.  This option disables the output shown by
-	--stats.
+	Disable the output shown by --stats, making fast-import usually
+	be silent when it is successful.  However, if the import stream
+	has directives intended to show user output (e.g. `progress`
+	directives), the corresponding messages will still be shown.
 
 --stats::
 	Display some basic statistics about the objects fast-import has