Merge branch 'svn' of http://netz.smurf.noris.de/git/git

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 1eae3d03337881359c7561cb0ac35c37cd67b8e8..e3873888f2236acb3ac04a6cda3784d61a2ce1a2 100644 (file)
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -1,6 +1,5 @@
 git-diff-files(1)
 =================
-v0.1, May 2005
 
 NAME
 ----
@@ -9,38 +8,22 @@ git-diff-files - Compares files in the working tree and the cache
 
 SYNOPSIS
 --------
-'git-diff-files' [-p] [-q] [-r] [-z] [-M] [-C] [-R] [<pattern>...]
+'git-diff-files' [-q] [<common diff options>] [<path>...]
 
 DESCRIPTION
 -----------
 Compares the files in the working tree and the cache.  When paths
 are specified, compares only those named paths.  Otherwise all
 entries in the cache are compared.  The output format is the
-same as "git-diff-cache" and "git-diff-tree".
+same as "git-diff-index" and "git-diff-tree".
 
 OPTIONS
 -------
--p::
-       generate patch (see section on generating patches).
+include::diff-options.txt[]
 
 -q::
        Remain silent even on nonexisting files
 
--R::
-       Output diff in reverse.
-
--M::
-       Detect renames; implies -p.
-
--C::
-       Detect copies as well as renames; implies -p.
-
--r::
-       This flag does not mean anything.  It is there only to match
-       git-diff-tree.  Unlike git-diff-tree, git-diff-files always looks
-       at all the subdirectories.
-
-
 Output format
 -------------
 include::diff-format.txt[]
@@ -56,5 +39,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite