summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-07-03 04:54:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-05 18:24:39 (GMT)
commit0cafe944e9c1d50e0b4377fbf26f2fc1544d0204 (patch)
tree2b915ba7ca889783e6d8979eb5f5e8c7338b1769 /Documentation/user-manual.txt
parent9c67c757191b34760bf5f6c1d1426ce1bb01ef08 (diff)
downloadgit-0cafe944e9c1d50e0b4377fbf26f2fc1544d0204.zip
git-0cafe944e9c1d50e0b4377fbf26f2fc1544d0204.tar.gz
git-0cafe944e9c1d50e0b4377fbf26f2fc1544d0204.tar.bz2
Documentation: fix gitlinks
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index ca13266..cbfc5d0 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:
-------------------------------------------------