Merge branch 'sp/maint-pack-memuse' into maint

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 57c28628bbfb86b7fa190f7530583fc6ac665d9e..7acd428964a9e6ffc4b876ce01731c1daf3a72bc 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite