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

diff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt
index 79c03ee7f7ea886094e2dfa85211f0539f51a4ab..8282a5e82b6e897ac501ef05c982d5e69415363f 100644 (file)
--- a/Documentation/git-peek-remote.txt
+++ b/Documentation/git-peek-remote.txt
@@ -39,7 +39,7 @@ OPTIONS
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------