diff --relative: output paths as relative to the current subdirectory

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index f35d0e1b4560a4970e7423011b585e1ff7d538c1..ee95df3bc07874bb74b77899f113830b943066f6 100644 (file)
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite