diff --git a/_docs/080_encryption.md b/_docs/080_encryption.md index 739cb27..0e07083 100644 --- a/_docs/080_encryption.md +++ b/_docs/080_encryption.md @@ -38,3 +38,14 @@ be enabled using the `yadm.gpg-recipient` configuration. To do so, run: yadm config yadm.gpg-recipient For this to work, `` must exist in your gpg keyrings. + +## git-crypt + +git-crypt is a tool that enables transparent encryption and decryption of files +in a Git repository. If git-crypt is installed, you can use it with your yadm +repository. + +Simply use it normally, prefacing the `git-crypt` commands with `yadm`. + +You can learn more about [git-crypt](https://github.com/AGWA/git-crypt) at this +[website](https://www.agwa.name/projects/git-crypt/). diff --git a/_docs/110_faq.md b/_docs/110_faq.md index 91e9c01..2f002af 100644 --- a/_docs/110_faq.md +++ b/_docs/110_faq.md @@ -151,13 +151,7 @@ export GPG_TTY=$(tty) ### Can I use yadm and git-crypt? -There is an experimental version of yadm which can use git-crypt. You -can find it in the [git-crypt-support branch]( -https://github.com/TheLocehiliosan/yadm/commits/git-crypt-support -). See the -[notes]( -https://github.com/TheLocehiliosan/yadm/commit/efb7fd16612fe650b1286f0c696696f412772ab3 -) in the commit messages of that branch for details. +Yes, yadm now supports git-crypt. Read more [here](/docs/encryption#git-crypt). ## Directory Creation