Andrew's git / gitweb.git / blobdiff
?
git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / git-branch.txt
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index fc5a4a602fb7cbc5e73f7029a0b82bba05d0b913..6103d62fe3dca23c78b16dbdbb5ba231a6b39bf7 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -205,7 +205,7 @@ but different purposes:
 
 Author
 ------
-Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
+Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------