summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-21 12:14:42 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-21 12:14:42 -0700
commit59eb68aa2b4e52aa1d098e0d76c5130864ceff2e (patch)
tree92a8885ec88a99c353cefd90c5af97601504a1fd /Documentation/git-merge.txt
parent93310a40eb022a0e36e7c618921931d8ffc31fd1 (diff)
downloadgit-59eb68aa2b4e52aa1d098e0d76c5130864ceff2e.tar.gz
Update my e-mail address
The old cox.net address is still getting mails from gitters. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index a7487d3dfd..2db8880989 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -145,7 +145,7 @@ linkgit:git-mergetool[1]
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation