diff --git a/README b/README index a969d9e..f9e7427 100644 --- a/README +++ b/README @@ -109,11 +109,6 @@ Files encrypted with git-crypt are not compressible. Even the smallest change to an encrypted file requires git to store the entire changed file, instead of just a delta. -Files encrypted with git-crypt cannot be patched with git-apply, unless -the patch itself is encrypted. To generate an encrypted patch, use `git -diff --no-textconv --binary`. Alternatively, you can apply a plaintext -patch outside of git using the patch command. - Although git-crypt protects individual file contents with a SHA-1 HMAC, git-crypt cannot be used securely unless the entire repository is protected against tampering (an attacker who can mutate your repository @@ -121,6 +116,11 @@ can alter your .gitattributes file to disable encryption). If necessary, use git features such as signed tags instead of relying solely on git-crypt for integrity. +Files encrypted with git-crypt cannot be patched with git-apply, unless +the patch itself is encrypted. To generate an encrypted patch, use `git +diff --no-textconv --binary`. Alternatively, you can apply a plaintext +patch outside of git using the patch command. + git-crypt does not work reliably with Atlassian SourceTree. Files might be left in an unencrypted state. See . diff --git a/README.md b/README.md index 7271f39..5a5d28e 100644 --- a/README.md +++ b/README.md @@ -111,11 +111,6 @@ Files encrypted with git-crypt are not compressible. Even the smallest change to an encrypted file requires git to store the entire changed file, instead of just a delta. -Files encrypted with git-crypt cannot be patched with git-apply, unless -the patch itself is encrypted. To generate an encrypted patch, use `git -diff --no-textconv --binary`. Alternatively, you can apply a plaintext -patch outside of git using the patch command. - Although git-crypt protects individual file contents with a SHA-1 HMAC, git-crypt cannot be used securely unless the entire repository is protected against tampering (an attacker who can mutate your repository @@ -123,6 +118,11 @@ can alter your .gitattributes file to disable encryption). If necessary, use git features such as signed tags instead of relying solely on git-crypt for integrity. +Files encrypted with git-crypt cannot be patched with git-apply, unless +the patch itself is encrypted. To generate an encrypted patch, use `git +diff --no-textconv --binary`. Alternatively, you can apply a plaintext +patch outside of git using the patch command. + git-crypt does [not work reliably with Atlassian SourceTree](https://jira.atlassian.com/browse/SRCTREE-2511). Files might be left in an unencrypted state.