mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2021-12-09 09:52:29 -04:00
commit 2a5f0d70e2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/forum/conflict_with_git-crypt/comment_2_cda648fcc5f213af06fe98428910f561._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="alt"
subject="comment 2"
date="2021-12-08T20:01:33Z"
content="""
Thank you for your explanation!
Removing `* filter=annex` altogether causes problems when the repo has unlocked files, but removing it from `.git/info/attributes` and adding a `.gitattributes` file with the following contents at the repository root seems to allow both git-crypt and git-annex to work without issue:
```
* filter=annex
my_secret filter=git-crypt diff=git-crypt
```
"""]]