Merge branch 'qq/maint' into maint

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 29ed0acc62156a743db2741d1f576fca87eebff1..baaf2bc8feefe4fb88a1ec43d2f70bbfdfe6fbf6 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -81,4 +81,4 @@ Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.or
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite