Do a cross-project merge of Paul Mackerras' gitk visualizer

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 8439355b06e60f964e3789543618b8f64460ecbd..32e9a1e7609eb6f6474bbf94be38585223fcda66 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the cache
 
 SYNOPSIS
 --------
-'git-diff-files' [-p] [-q] [-r] [-z] [-B] [-M] [-C] [-R] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<pattern>...]
+'git-diff-files' [-p] [-q] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<path>...]
 
 DESCRIPTION
 -----------
@@ -27,7 +27,8 @@ OPTIONS
        Remain silent even on nonexisting files
 
 -R::
-       Output diff in reverse.
+       Swap two inputs; that is, show differences from on-disk files
+       to cache contents.
 
 -B::
        Break complete rewrite changes into pairs of delete and create.
@@ -38,6 +39,14 @@ OPTIONS
 -C::
        Detect copies as well as renames.
 
+--find-copies-harder::
+       By default, -C option finds copies only if the original
+       file of the copy was modified in the same changeset for
+       performance reasons.  This flag makes the command
+       inspect unmodified files as candidates for the source of
+       copy.  This is a very expensive operation for large
+       projects, so use it with caution.
+
 -S<string>::
        Look for differences that contains the change in <string>.