diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:40 -0400 |
| commit | 022e81407e7d806100a0882c0f23067a88b4900a (patch) | |
| tree | b8035dc47239d6b687aa83adef0d45e11ac65969 /doc/special_remotes | |
| parent | 52089bbe73d95c5a2c06a3c58c507129335e5580 (diff) | |
| parent | e9128138ef1e19a341d7edfda4db2d6b1f8f6b0a (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
git-annex.cabal
Diffstat (limited to 'doc/special_remotes')
| -rw-r--r-- | doc/special_remotes/gcrypt.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/special_remotes/gcrypt.mdwn b/doc/special_remotes/gcrypt.mdwn index c9a22b01a..d5f3f7b5b 100644 --- a/doc/special_remotes/gcrypt.mdwn +++ b/doc/special_remotes/gcrypt.mdwn @@ -46,7 +46,7 @@ force it to re-push everything again, so that the encrypted repository can be decrypted by the added keys. Probably this can be done by setting `GCRYPT_FULL_REPACK` and doing a forced push of branches. -Recent versions of git-annex configure gcrypt-publish-participants when +Recent versions of git-annex configure `remote.<name>`gcrypt-publish-participants` when setting up a gcrypt repository. This is done to avoid unncessary gpg passphrase prompts, but it does publish the gpg keyids that can decrypt the repository. Unset it if you need to obscure that. |