summaryrefslogtreecommitdiff
path: root/doc/git-union-merge.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-21 12:50:09 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-21 12:50:09 -0400
commit2f2635528d8e428e0fafaf7877a4572a397cdf52 (patch)
treeaea27617e406050b507efa379ea6a1bf7497d6d3 /doc/git-union-merge.mdwn
parent14a50deef7c83c104ce5e706dfb2e9887a37e663 (diff)
update my email address and homepage url
Diffstat (limited to 'doc/git-union-merge.mdwn')
-rw-r--r--doc/git-union-merge.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/git-union-merge.mdwn b/doc/git-union-merge.mdwn
index 8e3c34f8f..d0ceb3a8f 100644
--- a/doc/git-union-merge.mdwn
+++ b/doc/git-union-merge.mdwn
@@ -31,7 +31,7 @@ File modes are not currently merged.
# AUTHOR
-Joey Hess <joey@kitenet.net>
+Joey Hess <id@joeyh.name>
<http://git-annex.branchable.com/>