summaryrefslogtreecommitdiffstats
path: root/git-fmt-merge-msg.html
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.html
parent5ba2c22cf94a8ecb23dfd14fab77cc9e4166653f (diff)
downloadgit-htmldocs-0868a302deebe5253106fdf9af00c82e2c711e66.tar.gz
Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
Diffstat (limited to 'git-fmt-merge-msg.html')
-rw-r--r--git-fmt-merge-msg.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 3e1905a91..6811789cd 100644
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -409,7 +409,7 @@ merge.summary
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p></div>
+<div class="para"><p>Written by Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
@@ -421,7 +421,7 @@ merge.summary
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:47 UTC
+Last updated 2008-07-22 09:19:09 UTC
</div>
</div>
</body>