diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-01-12 15:16:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-12 15:16:54 -0800 |
| commit | 72d25911eb6adc450aabb741cb911bf6aa89a322 (patch) | |
| tree | 4b5f058042658caa86b53a7c058b82999def082b /Documentation | |
| parent | Merge branch 'sb/submodule-parallel-fetch' (diff) | |
| parent | blame: add support for --[no-]progress option (diff) | |
| download | tgif-72d25911eb6adc450aabb741cb911bf6aa89a322.tar.xz | |
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')
| -rw-r--r-- | Documentation/blame-options.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-blame.txt | 3 |
2 files changed, 9 insertions, 1 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 diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index e6e947c808..ba5417567c 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -10,7 +10,8 @@ SYNOPSIS [verse] 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] - [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>] [--] <file> + [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>] + [--] <file> DESCRIPTION ----------- |