summaryrefslogtreecommitdiff
path: root/Annex
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 /Annex
parent14a50deef7c83c104ce5e706dfb2e9887a37e663 (diff)
update my email address and homepage url
Diffstat (limited to 'Annex')
-rw-r--r--Annex/AutoMerge.hs2
-rw-r--r--Annex/Branch.hs2
-rw-r--r--Annex/Branch/Transitions.hs2
-rw-r--r--Annex/BranchState.hs2
-rw-r--r--Annex/CatFile.hs2
-rw-r--r--Annex/CheckAttr.hs2
-rw-r--r--Annex/CheckIgnore.hs2
-rw-r--r--Annex/Content.hs2
-rw-r--r--Annex/Content/Direct.hs2
-rw-r--r--Annex/Direct.hs2
-rw-r--r--Annex/Direct/Fixup.hs2
-rw-r--r--Annex/Drop.hs2
-rw-r--r--Annex/Environment.hs2
-rw-r--r--Annex/FileMatcher.hs2
-rw-r--r--Annex/Hook.hs2
-rw-r--r--Annex/Index.hs2
-rw-r--r--Annex/Init.hs2
-rw-r--r--Annex/Journal.hs2
-rw-r--r--Annex/Link.hs2
-rw-r--r--Annex/LockFile.hs2
-rw-r--r--Annex/MakeRepo.hs2
-rw-r--r--Annex/MetaData.hs2
-rw-r--r--Annex/MetaData/StandardFields.hs2
-rw-r--r--Annex/Notification.hs2
-rw-r--r--Annex/Path.hs2
-rw-r--r--Annex/Perms.hs2
-rw-r--r--Annex/Queue.hs2
-rw-r--r--Annex/Quvi.hs2
-rw-r--r--Annex/ReplaceFile.hs2
-rw-r--r--Annex/Ssh.hs2
-rw-r--r--Annex/TaggedPush.hs2
-rw-r--r--Annex/Transfer.hs2
-rw-r--r--Annex/UUID.hs2
-rw-r--r--Annex/Url.hs2
-rw-r--r--Annex/VariantFile.hs2
-rw-r--r--Annex/Version.hs2
-rw-r--r--Annex/View.hs2
-rw-r--r--Annex/View/ViewedFile.hs2
-rw-r--r--Annex/Wanted.hs2
39 files changed, 39 insertions, 39 deletions
diff --git a/Annex/AutoMerge.hs b/Annex/AutoMerge.hs
index c19011e2d..92cccc004 100644
--- a/Annex/AutoMerge.hs
+++ b/Annex/AutoMerge.hs
@@ -1,6 +1,6 @@
{- git-annex automatic merge conflict resolution
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index f5c490212..2191ec263 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -1,6 +1,6 @@
{- management of the git-annex branch
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Branch/Transitions.hs b/Annex/Branch/Transitions.hs
index 9d306fe80..a9c7daa20 100644
--- a/Annex/Branch/Transitions.hs
+++ b/Annex/Branch/Transitions.hs
@@ -1,6 +1,6 @@
{- git-annex branch transitions
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/BranchState.hs b/Annex/BranchState.hs
index 9b2f9a04c..889a936b9 100644
--- a/Annex/BranchState.hs
+++ b/Annex/BranchState.hs
@@ -2,7 +2,7 @@
-
- Runtime state about the git-annex branch.
-
- - Copyright 2011-2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs
index 8a6f10def..179149844 100644
--- a/Annex/CatFile.hs
+++ b/Annex/CatFile.hs
@@ -1,6 +1,6 @@
{- git cat-file interface, with handle automatically stored in the Annex monad
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/CheckAttr.hs b/Annex/CheckAttr.hs
index 8eed9e804..46c71fe72 100644
--- a/Annex/CheckAttr.hs
+++ b/Annex/CheckAttr.hs
@@ -1,6 +1,6 @@
{- git check-attr interface, with handle automatically stored in the Annex monad
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/CheckIgnore.hs b/Annex/CheckIgnore.hs
index f2ed93543..8d7df1e2c 100644
--- a/Annex/CheckIgnore.hs
+++ b/Annex/CheckIgnore.hs
@@ -1,7 +1,7 @@
{- git check-ignore interface, with handle automatically stored in
- the Annex monad
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 60daaab90..73f27fd28 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -1,6 +1,6 @@
{- git-annex file content managing
-
- - Copyright 2010-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs
index 4392b5198..e6a9b5eda 100644
--- a/Annex/Content/Direct.hs
+++ b/Annex/Content/Direct.hs
@@ -1,6 +1,6 @@
{- git-annex file content managing for direct mode
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Direct.hs b/Annex/Direct.hs
index 998849ad3..06d0342c1 100644
--- a/Annex/Direct.hs
+++ b/Annex/Direct.hs
@@ -1,6 +1,6 @@
{- git-annex direct mode
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Direct/Fixup.hs b/Annex/Direct/Fixup.hs
index 13485242a..793f92eaf 100644
--- a/Annex/Direct/Fixup.hs
+++ b/Annex/Direct/Fixup.hs
@@ -1,6 +1,6 @@
{- git-annex direct mode guard fixup
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Drop.hs b/Annex/Drop.hs
index c5a3fbe5f..6f3b95615 100644
--- a/Annex/Drop.hs
+++ b/Annex/Drop.hs
@@ -1,6 +1,6 @@
{- dropping of unwanted content
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Environment.hs b/Annex/Environment.hs
index ffdd07157..13b52aa75 100644
--- a/Annex/Environment.hs
+++ b/Annex/Environment.hs
@@ -1,6 +1,6 @@
{- git-annex environment
-
- - Copyright 2012, 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs
index 856c68122..c6a729a9c 100644
--- a/Annex/FileMatcher.hs
+++ b/Annex/FileMatcher.hs
@@ -1,6 +1,6 @@
{- git-annex file matching
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Hook.hs b/Annex/Hook.hs
index 44542c12d..253c77a60 100644
--- a/Annex/Hook.hs
+++ b/Annex/Hook.hs
@@ -4,7 +4,7 @@
- not change, otherwise removing old hooks using an old version of
- the script would fail.
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Index.hs b/Annex/Index.hs
index 7757a412b..60340c50b 100644
--- a/Annex/Index.hs
+++ b/Annex/Index.hs
@@ -1,6 +1,6 @@
{- Using other git index files
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Init.hs b/Annex/Init.hs
index b335d10d3..6947ea119 100644
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -1,6 +1,6 @@
{- git-annex repository initialization
-
- - Copyright 2011 Joey Hess <joey@kitenet.net>
+ - Copyright 2011 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Journal.hs b/Annex/Journal.hs
index 798bcba29..148cefbbc 100644
--- a/Annex/Journal.hs
+++ b/Annex/Journal.hs
@@ -4,7 +4,7 @@
- git-annex branch. Among other things, it ensures that if git-annex is
- interrupted, its recorded data is not lost.
-
- - Copyright 2011-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2011-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Link.hs b/Annex/Link.hs
index e50b97447..98b200f0a 100644
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
@@ -5,7 +5,7 @@
- On other filesystems, git instead stores the symlink target in a regular
- file.
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/LockFile.hs b/Annex/LockFile.hs
index 75047e005..18e876c75 100644
--- a/Annex/LockFile.hs
+++ b/Annex/LockFile.hs
@@ -1,6 +1,6 @@
{- git-annex lock files.
-
- - Copyright 2012, 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012, 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/MakeRepo.hs b/Annex/MakeRepo.hs
index a1f797a76..73443c43d 100644
--- a/Annex/MakeRepo.hs
+++ b/Annex/MakeRepo.hs
@@ -1,6 +1,6 @@
{- making local repositories (used by webapp mostly)
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/MetaData.hs b/Annex/MetaData.hs
index 22e9e7e50..3b776a6d7 100644
--- a/Annex/MetaData.hs
+++ b/Annex/MetaData.hs
@@ -1,6 +1,6 @@
{- git-annex metadata
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/MetaData/StandardFields.hs b/Annex/MetaData/StandardFields.hs
index d41fb1506..c91b53930 100644
--- a/Annex/MetaData/StandardFields.hs
+++ b/Annex/MetaData/StandardFields.hs
@@ -1,6 +1,6 @@
{- git-annex metadata, standard fields
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Notification.hs b/Annex/Notification.hs
index 608bda7e2..25f1ee678 100644
--- a/Annex/Notification.hs
+++ b/Annex/Notification.hs
@@ -1,6 +1,6 @@
{- git-annex desktop notifications
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Path.hs b/Annex/Path.hs
index a8c4907b2..6186a887b 100644
--- a/Annex/Path.hs
+++ b/Annex/Path.hs
@@ -1,6 +1,6 @@
{- git-annex program path
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Perms.hs b/Annex/Perms.hs
index 3430554c7..3ae351d8c 100644
--- a/Annex/Perms.hs
+++ b/Annex/Perms.hs
@@ -1,6 +1,6 @@
{- git-annex file permissions
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Queue.hs b/Annex/Queue.hs
index a5ef60037..47837e2d9 100644
--- a/Annex/Queue.hs
+++ b/Annex/Queue.hs
@@ -1,6 +1,6 @@
{- git-annex command queue
-
- - Copyright 2011, 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2011, 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Quvi.hs b/Annex/Quvi.hs
index 1a2edf6b8..8d4591b48 100644
--- a/Annex/Quvi.hs
+++ b/Annex/Quvi.hs
@@ -1,6 +1,6 @@
{- quvi options for git-annex
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/ReplaceFile.hs b/Annex/ReplaceFile.hs
index 0355ddd51..1144ba083 100644
--- a/Annex/ReplaceFile.hs
+++ b/Annex/ReplaceFile.hs
@@ -1,6 +1,6 @@
{- git-annex file replacing
-
- - Copyright 2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index 15b169862..84637fd3d 100644
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -1,6 +1,6 @@
{- git-annex ssh interface, with connection caching
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/TaggedPush.hs b/Annex/TaggedPush.hs
index a31758022..642d4db0b 100644
--- a/Annex/TaggedPush.hs
+++ b/Annex/TaggedPush.hs
@@ -1,6 +1,6 @@
{- git-annex tagged pushes
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs
index 1603974ff..2723b2351 100644
--- a/Annex/Transfer.hs
+++ b/Annex/Transfer.hs
@@ -1,6 +1,6 @@
{- git-annex transfers
-
- - Copyright 2012-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2012-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/UUID.hs b/Annex/UUID.hs
index ec642a0fe..7776b778a 100644
--- a/Annex/UUID.hs
+++ b/Annex/UUID.hs
@@ -6,7 +6,7 @@
- UUIDs of remotes are cached in git config, using keys named
- remote.<name>.annex-uuid
-
- - Copyright 2010-2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010-2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Url.hs b/Annex/Url.hs
index 736905d33..b1a932e62 100644
--- a/Annex/Url.hs
+++ b/Annex/Url.hs
@@ -1,7 +1,7 @@
{- Url downloading, with git-annex user agent and configured http
- headers and wget/curl options.
-
- - Copyright 2013-2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2013-2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/VariantFile.hs b/Annex/VariantFile.hs
index 7c849c59f..89cfbc16a 100644
--- a/Annex/VariantFile.hs
+++ b/Annex/VariantFile.hs
@@ -1,6 +1,6 @@
{- git-annex .variant files for automatic merge conflict resolution
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Version.hs b/Annex/Version.hs
index 2a75a1c55..d08f994e9 100644
--- a/Annex/Version.hs
+++ b/Annex/Version.hs
@@ -1,6 +1,6 @@
{- git-annex repository versioning
-
- - Copyright 2010,2013 Joey Hess <joey@kitenet.net>
+ - Copyright 2010,2013 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/View.hs b/Annex/View.hs
index e148203c2..3a9168f6c 100644
--- a/Annex/View.hs
+++ b/Annex/View.hs
@@ -1,6 +1,6 @@
{- metadata based branch views
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/View/ViewedFile.hs b/Annex/View/ViewedFile.hs
index 0b963fcd5..0acba235a 100644
--- a/Annex/View/ViewedFile.hs
+++ b/Annex/View/ViewedFile.hs
@@ -1,6 +1,6 @@
{- filenames (not paths) used in views
-
- - Copyright 2014 Joey Hess <joey@kitenet.net>
+ - Copyright 2014 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}
diff --git a/Annex/Wanted.hs b/Annex/Wanted.hs
index 42f813bbb..87b4377c2 100644
--- a/Annex/Wanted.hs
+++ b/Annex/Wanted.hs
@@ -1,6 +1,6 @@
{- git-annex checking whether content is wanted
-
- - Copyright 2012 Joey Hess <joey@kitenet.net>
+ - Copyright 2012 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU GPL version 3 or higher.
-}