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

This commit is contained in:
Joey Hess 2021-04-22 09:40:25 -04:00
commit 7b465515e6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 26 additions and 0 deletions

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="Atemu"
avatar="http://cdn.libravatar.org/avatar/d1f0f4275931c552403f4c6707bead7a"
subject="comment 8"
date="2021-04-22T10:01:01Z"
content="""
It'd also be helpful if this could be integrated into the unannex subcommand:
`git annex add file` -> realise it shouldn't have been added -> `git annex unannex --forget file`
That would make for a rather intuitive and user-friendly workflow.
If the git-annex branch is unpushed, it could even be rebased to reflect that change but that might be too complicated to do reliably.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="pat"
avatar="http://cdn.libravatar.org/avatar/6b552550673a6a6df3b33364076f8ea8"
subject="comment 2"
date="2021-04-21T22:33:55Z"
content="""
> Committing the files to a branch other than master might be a reasonable compromise. Then you can just copy the git-annex symlinks over to master as needed, or check out the branch from time to time.
I think that could work nicely. I do like the idea of having my files annexed, and distributing them across machines that way, so this strikes me as a good compromise.
Thank you for the idea!
"""]]