From: Junio C Hamano Date: Tue, 12 Jan 2016 23:16:54 +0000 (-0800) Subject: Merge branch 'ea/blame-progress' X-Git-Tag: v2.8.0-rc0~126 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/72d25911eb6adc450aabb741cb911bf6aa89a322 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 --- 72d25911eb6adc450aabb741cb911bf6aa89a322 diff --cc Documentation/blame-options.txt index 760eab7428,cd415e6287..02cb6845cd --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@@ -63,12 -63,20 +63,19 @@@ include::line-range-format.txt[ `-` to make the command read from the standard input). --date :: - The value is one of the following alternatives: - {relative,local,default,iso,rfc,short}. If --date is not + Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the - iso format is used. For more information, See the discussion + 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||:: Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file