Andrew's git / gitweb.git / blobdiff
?
git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / git-cherry.txt
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index d761a73423e606a38f8e390117107a99b9ae3bd3..74d14c4e7fc88e702e4781b22eb8ed5ce0480c6f 100644 (file)
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -64,7 +64,7 @@ linkgit:git-patch-id[1]
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------