Merge /pub/scm/git/git to recover lost side branch

diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 3e1244f8d316134cd33c96f74199a56bb2625e20..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
 ----
@@ -16,7 +15,7 @@ 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
 -------
@@ -40,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