Merge branch 'qq/maint' into maint

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 7b7859967326acaff157eab01da16b83c1342fcc..d9881fbbbedb84f400bf0b630dcb60acd5ad4e9e 100644 (file)
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -91,4 +91,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite