diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-09 15:05:08 -0400 |
| commit | 75d29250823326c8b4894a855927f65b5fdf4e13 (patch) | |
| tree | a888b86d8e0569b9e1c388700dd6717aaa175834 /doc | |
| parent | 377bf24d9a951186b374cd7a3f920b6bc9deb8f1 (diff) | |
| parent | 8d5374f4a33f398baa166035e5fafb716a78fd1d (diff) | |
Merge branch 'master' into checkout
Conflicts:
debian/changelog
doc/backends.mdwn
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/backends.mdwn | 13 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 4 | ||||
| -rw-r--r-- | doc/todo/immutable_annexed_files.mdwn | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/doc/backends.mdwn b/doc/backends.mdwn index 69c17649a..be4eac723 100644 --- a/doc/backends.mdwn +++ b/doc/backends.mdwn @@ -10,14 +10,15 @@ Multiple pluggable backends are supported, and a single repository can use different backends for different files. * `WORM` ("Write Once, Read Many") This backend stores the file's content - only in `.git/annex/`, and assumes that any file with the same basename, - size, and modification time has the same content. So with this backend, - files can be moved around, but should never be added to or changed. - This is the default, and the least expensive backend. + only in `.git/annex/objects/`, and assumes that any file with the same + basename, size, and modification time has the same content. So with + this backend, files can be moved around, but should never be added to + or changed. This is the default, and the least expensive backend. * `SHA1` -- This backend stores the file's content in - `.git/annex/`, with a name based on its sha1 checksum. This backend allows - modifications of files to be tracked. Its need to generate checksums + `.git/annex/objects/`, with a name based on its sha1 checksum. This backend + allows modifications of files to be tracked. Its need to generate checksums can make it slower for large files. + for use. * `URL` -- This backend downloads the file's content from an external URL. The `annex.backends` git-config setting can be used to list the backends diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 80680820f..3bb3b0835 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -219,6 +219,8 @@ Here are all the supported configuration settings. to talk to this repository. * `annex.scp-options` and `annex.ssh-options` -- Default scp and ssh options to use if a remote does not have specific options. +* `annex.version` -- Automatically maintained, and used to automate upgrades + between versions. The backend used when adding a new file to the annex can be configured on a per-file-type basis via the `.gitattributes` file. In the file, @@ -233,7 +235,7 @@ but the SHA1 backend for ogg files: These files are used, in your git repository: -`.git/annex/` contains the annexed file contents that are currently +`.git/annex/objects/` contains the annexed file contents that are currently available. Annexed files in your git repository symlink to that content. `.git-annex/uuid.log` is used to map between repository UUID and diff --git a/doc/todo/immutable_annexed_files.mdwn b/doc/todo/immutable_annexed_files.mdwn index e5207dc16..b26838e95 100644 --- a/doc/todo/immutable_annexed_files.mdwn +++ b/doc/todo/immutable_annexed_files.mdwn @@ -4,3 +4,5 @@ > josh: Oh, I just thought of another slightly crazy but handy idea. > josh: I'd hate to run into a program which somehow followed the symlink and then did an unlink to replace the file. > josh: To break that, you could create a new directory under annex's internal directory for each file, and make the directory have no write permission. + +[[done]] and done --[[Joey]] |