Andrew's git / gitweb.git / blobdiff
?
Merge branch 'maint-1.5.5' into maint-1.5.6
[gitweb.git] / Documentation / git-branch.txt
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 0fd58083eb2afdb7fed7ebf01bab3b5e1cae1421..39cd5d961f4696c36b3050c880af413c95da9282 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -202,7 +202,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
 --------------