Merge branch 'master' into importtree

This commit is contained in:
Joey Hess 2019-02-22 21:18:13 -04:00
commit 4e0d08b66b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 110 additions and 6 deletions

View file

@ -3,6 +3,8 @@ and the remote allows files to somehow be edited on it, then there ought
to be a way to import the changes back from the remote into the git repository.
The command could be `git annex import --from remote`
There also ought to be a way to make `git annex sync` automatically import.
See [[design/importing_trees_from_special_remotes]] for current design for
this.