From: Jonathan Nieder Date: Thu, 3 Jul 2008 04:54:38 +0000 (-0500) Subject: Documentation: fix gitlinks X-Git-Tag: v1.6.0-rc0~151 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0cafe944e9c1d50e0b4377fbf26f2fc1544d0204;p=git.git Documentation: fix gitlinks Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 0d72e8302..c956affb4 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -72,7 +72,7 @@ OPTIONS `git-update-server-info`. This option skips updating local catalog files needed to publish this repository (or a direct copy of it) - over HTTP or FTP. See gitlink:git-update-server-info[1]. + over HTTP or FTP. See linkgit:git-update-server-info[1]. --window=[N]:: --depth=[N]:: diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index ca13266b1..cbfc5d03a 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1303,7 +1303,7 @@ $ git diff -3 file.txt # diff against stage 3 $ git diff --theirs file.txt # same as the above. ------------------------------------------------- -The linkgit:git-log[1] and gitk[1] commands also provide special help +The linkgit:git-log[1] and linkgit:gitk[1] commands also provide special help for merges: -------------------------------------------------