summaryrefslogtreecommitdiffstats
path: root/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-22 09:20:44 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-22 09:20:44 +0000
commit0868a302deebe5253106fdf9af00c82e2c711e66 (patch)
treef24a8821760fc2732d75ec72e5527620e5138fa6 /git-fmt-merge-msg.txt
parent5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f (diff)
downloadgit-htmldocs-0868a302deebe5253106fdf9af00c82e2c711e66.tar.gz
Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Diffstat (limited to 'git-fmt-merge-msg.txt')
-rw-r--r--git-fmt-merge-msg.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt
index 885edf005..1c24796d6 100644
--- a/git-fmt-merge-msg.txt
+++ b/git-fmt-merge-msg.txt
@@ -61,7 +61,7 @@ linkgit:git-merge[1]
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------