Merge branch 'maint'

diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index 6892fdac3df054e87019318c524185109ea16200..4cc0964e78b0719e0711214943f2ae2824cdbcce 100644 (file)
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -33,4 +33,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