summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar guilhem <guilhem@fripost.org>2013-03-11 02:33:13 +0100
committerGravatar Joey Hess <joey@kitenet.net>2013-03-11 09:48:38 -0400
commit7fa1e498de9cbb84b23f90b17c66d755292ae716 (patch)
treedc1f5127473d3450b138b4aedfe43a5248d42939 /doc/git-annex.mdwn
parentf2292dc3b494dbed517a48ab2876594f5ace0179 (diff)
GnuPG options for symmetric encryption.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn15
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 7d9928d71..c34fd4bfb 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -904,10 +904,19 @@ Here are all the supported configuration settings.
For example, to limit the bandwidth to 100Kbyte/s, set it to "--bwlimit 100k"
(There is no corresponding option for bup join.)
-* `annex.ssh-options`, `annex.rsync-options`, `annex.bup-split-options`
+* `remote.<name>.annex-gnupg-options`
- Default ssh, rsync, wget/curl, and bup options to use if a remote does not
- have specific options.
+ Options to pass to GnuPG for symmetric encryption. For instance, to
+ use the AES cipher with a 256 bits key and disable compression, set it
+ to "--cipher-algo AES256 --compress-algo none". (These options take
+ precedence over the default GnuPG configuration, which is otherwise
+ used.)
+
+* `annex.ssh-options`, `annex.rsync-options`, `annex.bup-split-options`,
+ `annex.gnupg-options`
+
+ Default ssh, rsync, wget/curl, bup, and GnuPG options to use if a
+ remote does not have specific options.
* `annex.web-options`