summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-11-15 23:59:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-17 18:43:50 +0900
commitf55c979b14eb7788fb5b4fe5e04212191b53e477 (patch)
tree08851c249c3770ad6dca2ed2b4800e85cb1e168e /Documentation
parentfast-export: convert sha1 to oid (diff)
downloadtgif-f55c979b14eb7788fb5b4fe5e04212191b53e477.tar.xz
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fast-import.txt7
1 files changed, 4 insertions, 3 deletions
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