Merge branch 'master' into next

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 9ff7bc25c1e8ccdf8204414536ad4373bd868b89..af87966e511184c4e29b3b07fac01e0df53a618a 100644 (file)
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -38,5 +38,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite