aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/blame-options.txt
diff options
context:
space:
mode:
authorEdmundo Carmona Antoranz <eantoranz@gmail.com>2015-12-12 18:51:03 -0600
committerJunio C Hamano <gitster@pobox.com>2015-12-16 10:18:34 -0800
commitaba37f495ee39aa9506a375bb4c667731df39899 (patch)
tree330c1233fd9e8726d80e0becf5e059e1dcfafea2 /Documentation/blame-options.txt
parent1aaf14975709c069a87c2673551296a6eb3f82c5 (diff)
downloadgit-aba37f495ee39aa9506a375bb4c667731df39899.tar.gz
blame: add support for --[no-]progress option
Teach the command to show progress output when it takes long time to produce the first line of output; this option cannot be used with "--incremental" or "--porcelain" options. git-annotate inherits the option as well. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/blame-options.txt')
-rw-r--r--Documentation/blame-options.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index a09969ba08..cd415e6287 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -70,6 +70,13 @@ include::line-range-format.txt[]
iso format is used. For more information, See the discussion
of the --date option at linkgit:git-log[1].
+--[no-]progress::
+ Progress status is reported on the standard error stream
+ by default when it is attached to a terminal. This flag
+ enables progress reporting even if not attached to a
+ terminal. Can't use `--progress` together with `--porcelain`
+ or `--incremental`.
+
-M|<num>|::
Detect moved or copied lines within a file. When a commit
moves or copies a block of lines (e.g. the original file