Andrew's git / gitweb.git / blobdiff
?
Remove references to git-fetch-pack from "git clone" documentation.
[gitweb.git] / Documentation / git-merge.txt
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a7487d3dfdb20dc56909a7ebccaac6e3b7b36e48..2db88809898592c691166427efdd106d844d42d9 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -145,7 +145,7 @@ linkgit:git-mergetool[1]
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 
 Documentation