aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/blame-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-12 15:16:54 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-12 15:16:54 -0800
commit72d25911eb6adc450aabb741cb911bf6aa89a322 (patch)
tree4b5f058042658caa86b53a7c058b82999def082b /Documentation/blame-options.txt
parent187c0d3d9e63f7d84d7055372f07bedb52849f06 (diff)
parentaba37f495ee39aa9506a375bb4c667731df39899 (diff)
downloadgit-72d25911eb6adc450aabb741cb911bf6aa89a322.tar.gz
Merge branch 'ea/blame-progress'
"git blame" learned to produce the progress eye-candy when it takes too much time before emitting the first line of the result. * ea/blame-progress: blame: add support for --[no-]progress option
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 760eab7428..02cb6845cd 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -69,6 +69,13 @@ include::line-range-format.txt[]
iso format is used. For supported values, 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