Andrew's git / gitweb.git / blobdiff
?
checkout -m: recreate merge when checking out of unmerged index
[gitweb.git] / Documentation / git-hash-object.txt
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 9e654fc41cc2b4a97806b2cb9430650214522711..ac928e198e75595a6fcd4e83b89aaf68987bd420 100644 (file)
--- a/Documentation/git-hash-object.txt
+++ b/Documentation/git-hash-object.txt
@@ -37,7 +37,7 @@ OPTIONS
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------