difftool: handle unmerged files in dir-diff mode

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 760eab7428357ad4006437ae3032cee958dce803..02cb6845cd96194b655c9898189c4d5f24ca6a92 100644 (file)
--- 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