summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-28 08:40:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-28 08:40:05 -0400
commit3bdc5eb29077add9f2de18ba587ca88bb98cb63e (patch)
tree6af319f70484495f2f9f79908bd8b2364ac01fed /doc/git-annex.mdwn
parentc532be4c5deacf50659a54960c581a717c3b2f25 (diff)
will need gpg encryption for s3
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 6960c1966..c01f4fbc5 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -132,7 +132,7 @@ Many git-annex commands will stage changes for later `git commit` by you.
by uuid. To change the description of the current repository, use
"."
-* s3bucket name description [datacenter host port]
+* s3bucket name description [datacenter host port] [--key=gpgkey]
Creates a bucket in Amazon S3. The bucket's name can be used
to configure git remote using the bucket.
@@ -142,6 +142,10 @@ Many git-annex commands will stage changes for later `git commit` by you.
To use a different, S3-compatable service, specify a host and port.
+ By default, data (including filenames) is encrypted using gpg.
+ To use a key other than the default gpg key, specify it with
+ the --key option. To disable encryption, specify "none".
+
* fsck [path ...]
With no parameters, this command checks the whole annex for consistency,