aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-10 13:03:56 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-10 13:03:56 -0400
commitae8a630b3cfac9ed3ea8c3137619e13ee021071e (patch)
tree4c28656ee3a81c09b99cfee48844069a7958908b /doc/git-annex.mdwn
parentce8dcc753490e2a51cf86005944a5255520059cf (diff)
Added annex.gnupg-decrypt-options and remote.<name>.annex-gnupg-decrypt-options, which are passed to gpg when it's decrypting data.
The naming is unofrtunately not consistent, but the gnupg-options were only used for encrypting, and it's too late to change that. It would be nice to have a third setting that is always passed to gnupg, but ~/.gnupg/options can be used to specify such global options when really needed.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn11
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 236912df6..955f67629 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1189,15 +1189,22 @@ Here are all the supported configuration settings.
* `remote.<name>.annex-gnupg-options`
- Options to pass to GnuPG for symmetric encryption. For instance, to
+ Options to pass to GnuPG when it's encrypting data. 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.)
+* `remote.<name>.annex-gnupg-decrypt-options`
+
+ Options to pass to GnuPG when it's decrypting data. (These options take
+ precedence over the default GnuPG configuration, which is otherwise
+ used.)
+
* `annex.ssh-options`, `annex.rsync-options`,
`annex.rsync-upload-options`, `annex.rsync-download-options`,
- `annex.bup-split-options`, `annex.gnupg-options`
+ `annex.bup-split-options`, `annex.gnupg-options`,
+ `annex.gnupg-decrypt-options`
Default options to use if a remote does not have more specific options
as described above.