Merge branch 'maint-1.5.4' into maint

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index e6943822cd1c003d666178ea26f7b24e56ad210f..b0468aa746a074741de8b4a4ebeb82c177edb1e8 100644 (file)
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -66,4 +66,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite