X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=dc8a96adb00c0b674e12e071a4a56f89bfe8583d;hb=77097faa5dc3da2947f4a4bdb6f8a7766f4ef89a;hp=1dd134538da40a1f3547c55c49be3b418e6be0ab;hpb=10ce0209b69cebc32d9bfbe78067c752952425cc;p=git.git

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 1dd134538..dc8a96adb 100644
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -18,7 +18,7 @@ to resolve a merge after the trivial merge done with 'git-read-tree -m'.
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>,
-Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
+Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
 
 Documentation
 --------------