Merge 1.5.5.4 in

diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index 48f2d57b7b48fa9c8fb0cbc5fcb547d6aed32cbb..bd09196acccf75ecde10d6965e3f59fdcc1c2e21 100644 (file)
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -31,4 +31,4 @@ Documentation by Petr Baudis and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite