Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 7a76045eb742b38e726e15491db2bf4315cb8f6a..d214d4bf9d0e539c6bf58ba24dcd12aabbaea1d8 100644 (file)
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -1,4 +1,4 @@
-From:  Junio C Hamano <junkio@cox.net>
+From:  Junio C Hamano <gitster@pobox.com>
 To:    git@vger.kernel.org
 Cc:    Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org>
 Subject: Re: sending changesets from the middle of a git tree