Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next

diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index be597a17871e95d4219e32a1bf9446bfda43c5e2..3d8f8ef6670e84b5601fdcd3e74717a4f3a0fde4 100644 (file)
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -1,6 +1,5 @@
 git-upload-pack(1)
 ==================
-v0.1, July 2005
 
 NAME
 ----
@@ -37,4 +36,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite