Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index 894852a78b9c63e0be80af2c3b86c22f998a2b01..bb8a079254e7fed097504cd181eee71a888d2280 100644 (file)
--- a/Documentation/git-patch-id.txt
+++ b/Documentation/git-patch-id.txt
@@ -39,4 +39,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