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

devblog

Browse source
This commit is contained in:
Joey Hess 2019-03-01 16:55:24 -04:00
parent 84c9c93d58
commit 8de8574d5e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/devblog/day_576__import_tree_details.mdwn Normal file
View file

@ -0,0 +1,11 @@
Still working on [[todo/import_tree]] today. I decided to
make the imported commit be on an unrelated history from the main branch,
which avoids some very susprising merge behavior, but means
users will need to pass --allow-unrelated-histories to git merge.
Also got `export` and `sync` commands updating the remote tracking branch.
It was surprisingly complicated to do.
With that done, I've tested exporting to a directory remote,
then making changes to the directory manually, and importing, and it all
works together.