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

diff --cc Documentation/blame-options.txt
index 760eab7428357ad4006437ae3032cee958dce803,cd415e6287d91c440b64574cbdf345e40d622662..02cb6845cd96194b655c9898189c4d5f24ca6a92
--- 1/Documentation/blame-options.txt
--- 2/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 <format>::
 -      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|<num>|::
        Detect moved or copied lines within a file. When a commit
        moves or copies a block of lines (e.g. the original file

diff --cc builtin/blame.c
Simple merge