Merge branch 'master' into trackassociated

This commit is contained in:
Joey Hess 2021-05-24 16:27:24 -04:00
commit 63de81b52a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 12"""
date="2021-05-24T20:25:03Z"
content="""
This is about ready to be merged, and is fully working.
Except.. `git annex drop --auto --branch=foo` seems likely to do something
confusing, since it will check the associated files, which may not be on
that branch. That combination of options doesn't really make a lot of sense
anyway?
"""]]