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/git-blame.txt | |
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/git-blame.txt')
-rw-r--r-- | Documentation/git-blame.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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 ----------- |