git-annex

mirrors/git-annex

Fork 0

Commit graph

Author	SHA1	Message	Date
Joey Hess	5483ea90ec	graft exported tree into git-annex branch So it will be available later and elsewhere, even after GC. I first though to use git update-index to do this, but feeding it a line with a tree object seems to always cause it to generate a git subtree merge. So, fell back to using the Git.Tree interface to maniupulate the trees, and not involving the git-annex branch index file at all. This commit was sponsored by Andreas Karlsson.	2017-08-31 18:06:49 -04:00
Joey Hess	978885247e	implement export.log and resolve export conflicts Incremental export updates work now too. This commit was sponsored by Anthony DeRobertis on Patreon.	2017-08-31 15:47:23 -04:00

Author

SHA1

Message

Date

Joey Hess

5483ea90ec

graft exported tree into git-annex branch

So it will be available later and elsewhere, even after GC.

I first though to use git update-index to do this, but feeding it a line
with a tree object seems to always cause it to generate a git subtree
merge. So, fell back to using the Git.Tree interface to maniupulate the
trees, and not involving the git-annex branch index file at all.

This commit was sponsored by Andreas Karlsson.

2017-08-31 18:06:49 -04:00

Joey Hess

978885247e

implement export.log and resolve export conflicts

Incremental export updates work now too.

This commit was sponsored by Anthony DeRobertis on Patreon.

2017-08-31 15:47:23 -04:00

2 commits