Merge branch 'jc/error-message-in-cherry-pick'

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index f1e48dd0217c9506cbfb74343164d05473806bf3..fd83bc7833312b20a7ef045a9dfd128fc2539838 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -272,4 +272,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite