diff --git a/CHANGELOG b/CHANGELOG index e2d0b11dc3..fcd9097fa0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,12 +6,14 @@ git-annex (7.20190220) UNRELEASED; urgency=medium to allow git-annex import of files from the directory. This can be combined with exporttree=yes and git-annex export used to send changes back to the same directory. + * Remote tracking branches are updated when importing and exporting to + special remotes, in ways analagous to how git fetch and git push do. * export: Deprecated the --tracking option. Instead, users can configure remote..annex-tracking-branch themselves. - * Remote tracking branches are updated when importing and exporting to - special remotes, in ways analagous to how git fetch and git push do. - * sync, assistant: --no-push and remote.name.annex-push prevent exporting + * sync --content: When remote..annex-tracking-branch is configured, + import from special remotes. + * sync, assistant: --no-push and remote..annex-push prevent exporting trees to special remotes. * Fix storage of metadata values containing newlines. (Reversion introduced in version 7.20190122.)