Merge branch 'master' into next

diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt
index 2f2130d511735e2bb8709bfb8f5b9ad15e6a6150..213dc8196b90170cc14e35f7c637815b39a7ff8d 100644 (file)
--- a/Documentation/git-unpack-file.txt
+++ b/Documentation/git-unpack-file.txt
@@ -1,6 +1,5 @@
 git-unpack-file(1)
 ==================
-v0.1, May 2005
 
 NAME
 ----
@@ -33,5 +32,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite