diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
| commit | 33e7dd2e0b756270cb51d1ed574cbe4b8173c7cd (patch) | |
| tree | 0e9ff04c04c33cd1ba45171983d1b9f4d92cac60 /git-annex.cabal | |
| parent | 2d7b57270e628994483495159d2be715c8f9531b (diff) | |
| parent | 49475bb89542e92c6f466425f29cd0640a8e80f4 (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
Remote/S3.hs
Diffstat (limited to 'git-annex.cabal')
| -rw-r--r-- | git-annex.cabal | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 425bc3f90..94b1ed3be 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20140916 +Version: 5.20141013 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> @@ -18,13 +18,18 @@ Description: dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space. . - Even without file content tracking, being able to manage files with git, - move files around and delete files with versioned directory trees, and use - branches and distributed clones, are all very handy reasons to use git. And - annexed files can co-exist in the same git repository with regularly - versioned files, which is convenient for maintaining documents, Makefiles, - etc that are associated with annexed files but that benefit from full - revision control. + It can store large files in many places, from local hard drives, to a + large number of cloud storage services, including S3, WebDAV, + and rsync, with a dozen cloud storage providers usable via plugins. + Files can be stored encrypted with gpg, so that the cloud storage + provider cannot see your data. git-annex keeps track of where each file + is stored, so it knows how many copies are available, and has many + facilities to ensure your data is preserved. + . + git-annex can also be used to keep a folder in sync between computers, + noticing when files are changed, and automatically committing them + to git and transferring them to other computers. The git-annex webapp + makes it easy to set up and use git-annex this way. Flag S3 Description: Enable S3 support @@ -120,7 +125,7 @@ Executable git-annex GHC-Options: -O2 if (os(windows)) - Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3) + Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv C-Sources: Utility/winprocess.c else Build-Depends: unix |