Merge http://www.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 2131a29993405742fcc67ed81a578c06bf950f44..44983b692d56675e669e8a5ced20ff798c9a3133 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -57,5 +57,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