Merge branch 'lt/logopt' into next

diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 1e27bf23018c8d2c0630f6881ac1b79c92206b9c..d1d56f194aff866f49c5d0514ce9b47def456bfd 100644 (file)
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -1,6 +1,5 @@
 git-merge-base(1)
 =================
-v0.1, May 2005
 
 NAME
 ----
@@ -30,5 +29,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