summaryrefslogtreecommitdiffstats
path: root/git-rerere.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-01-07 07:55:46 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-01-07 07:55:46 +0000
commit35738e87105e1a11ced6a6b497146bbd189d4fb2 (patch)
tree352f4473f85ea0e327b3a0e3b9739d80f8462eb9 /git-rerere.txt
parent14b76487ff861981455b320a2c6d17632997773e (diff)
downloadgit-htmldocs-35738e87105e1a11ced6a6b497146bbd189d4fb2.tar.gz
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
Diffstat (limited to 'git-rerere.txt')
-rw-r--r--git-rerere.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.txt b/git-rerere.txt
index 8ce492c8f..3793267da 100644
--- a/git-rerere.txt
+++ b/git-rerere.txt
@@ -33,7 +33,7 @@ its working state.
'clear'::
This resets the metadata used by rerere if a merge resolution is to be
-is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
+is aborted. Calling linkgit:git-am[1] --skip or linkgit:git-rebase[1]
[--skip|--abort] will automatically invoke this command.
'diff'::
@@ -204,4 +204,4 @@ Written by Junio C Hamano <junkio@cox.net>
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite