Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt
index 6266e6f6589388571d981153500ee52c55e9870d..210fde03a12cd757769f81754e789a2a5934f02c 100644 (file)
--- a/Documentation/git-symbolic-ref.txt
+++ b/Documentation/git-symbolic-ref.txt
@@ -55,7 +55,7 @@ name is not a symbolic ref, or 128 if another error occurs.
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 GIT
 ---