Andrew's git / gitweb.git / blobdiff
?
git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / git-mailinfo.txt
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 316bcc679628c47c9734e0906665ce5f6e8e68fb..31eccea5bc0697ee461503734942429c2133ef3f 100644 (file)
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -60,7 +60,7 @@ conversion, even with this flag.
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
 
 
 Documentation