Am 22.11.2015 um 17:02 schrieb Edmundo Carmona Antoranz:
Will also affect annotate
Signed-off-by: Edmundo Carmona Antoranz <eantor...@gmail.com>
---
Documentation/blame-options.txt | 7 +++++++
Documentation/git-blame.txt | 9 ++++++++-
builtin/blame.c | 25 +++++++++++++++++++++++--
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 760eab7..43f4f08 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.
+
+
-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 e6e947c..2e63397 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>
+ [--[no-]progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse
<rev>]
+ [--] <file>
You add the option to to the synopsis of git-blame.txt, but not to
git-annotate.txt.
DESCRIPTION
-----------
@@ -88,6 +89,12 @@ include::blame-options.txt[]
abbreviated object name, use <n>+1 digits. Note that 1 column
is used for a caret to mark the boundary commit.
+--[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.
+
Any particular reason you add this text twice? As can be seen on the
hunk header, git-blame.txt includes blame-options.txt.
-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
