Merge 1.5.5.4 in

diff --git a/Documentation/git-mktree.txt b/Documentation/git-mktree.txt
index f312036ab5deb645ce45b83e47c83605c34b83a6..1ddbf00afccf93d2c31d3c6d0deabd82ff4fe779 100644 (file)
--- a/Documentation/git-mktree.txt
+++ b/Documentation/git-mktree.txt
@@ -31,4 +31,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite