Merge branch 'jc/delta' into next

diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
index 4f82efb4f97f562f632d286e0650ea320867a791..528a1b6ce30c51e944fe662b28ec91c9bd4bddd9 100644 (file)
--- a/Documentation/git-stripspace.txt
+++ b/Documentation/git-stripspace.txt
@@ -29,5 +29,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