Andrew's git / gitweb.git / blobdiff
?
git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / git-commit.txt
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 01bd2d6b77da49b759e1887cf98b8c5b3bf98c38..0e25bb862704eee4a22fe5349c04823d14ea9cba 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -331,7 +331,7 @@ linkgit:git-commit-tree[1]
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
 
 
 GIT