diff options
author | Joey Hess <joey@kitenet.net> | 2012-08-16 16:36:32 -0700 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-08-16 16:36:32 -0700 |
commit | cbca93cf7cdecc7fd2a66c4640da246462ecc7c7 (patch) | |
tree | a2b03b8661a660417c93c75e88a41114c427b7b7 /doc/special_remotes/S3.mdwn | |
parent | e89c7d3e6af69786458e885fe900c063e2d2af6a (diff) | |
parent | 1da4513f4d8c713f167b8e463d7703da5ac2d6a7 (diff) |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
Diffstat (limited to 'doc/special_remotes/S3.mdwn')
-rw-r--r-- | doc/special_remotes/S3.mdwn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn index 195693b3b..333e0bac5 100644 --- a/doc/special_remotes/S3.mdwn +++ b/doc/special_remotes/S3.mdwn @@ -36,5 +36,11 @@ the S3 remote. so by default, a bucket name is chosen based on the remote name and UUID. This can be specified to pick a bucket name. +* `fileprefix` - By default, git-annex places files in a tree rooted at the + top of the S3 bucket. When this is set, it's prefixed to the filenames + used. For example, you could set it to "foo/" in one special remote, + and to "bar/" in another special remote, and both special remotes could + then use the same bucket. + * `x-amz-*` are passed through as http headers when storing keys in S3. |