Merge branch 'jc/cvsimport' into next

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 9ff7bc25c1e8ccdf8204414536ad4373bd868b89..9a5e37186fcd03972d490e2e996ce8b078112bbb 100644 (file)
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -3,7 +3,7 @@ git-cherry(1)
 
 NAME
 ----
-git-cherry - Find commits not merged upstream.
+git-cherry - Find commits not merged upstream
 
 SYNOPSIS
 --------
@@ -38,5 +38,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