summaryrefslogtreecommitdiffstats
path: root/git-fmt-merge-msg.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-fmt-merge-msg.txt
parent14b76487ff861981455b320a2c6d17632997773e (diff)
downloadgit-htmldocs-35738e87105e1a11ced6a6b497146bbd189d4fb2.tar.gz
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
Diffstat (limited to 'git-fmt-merge-msg.txt')
-rw-r--r--git-fmt-merge-msg.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt
index 7088ed409..8615ae353 100644
--- a/git-fmt-merge-msg.txt
+++ b/git-fmt-merge-msg.txt
@@ -46,7 +46,7 @@ merge.summary::
SEE ALSO
--------
-gitlink:git-merge[1]
+linkgit:git-merge[1]
Author
@@ -59,4 +59,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.o
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite