Andrew's git / gitweb.git / blobdiff
?
Merge branch 'maint-1.5.5' into maint-1.5.6
[gitweb.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 55bc3674797366496d7c1ca1f5b6564b06c01de1..b05e0cee11352335cbeb1899e8d6cb7070395e37 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -159,7 +159,7 @@ linkgit:gitattributes[5]
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 
 Documentation