Merge branch 'exportreeplus'

diff --cc CHANGELOG
index dc18dcc8ddad187ed16b65f39dd3301e828ec312,46deba412b95a0cbd62dd351d36947306679041d..c598c84f9d71f9fe3fcaf5a0e31480b75e7e8a78
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,13 -1,25 +1,30 @@@
 -git-annex (10.20240732) UNRELEASED; urgency=medium
++git-annex (10.20240831) UNRELEASED; urgency=medium
+ 
 -  * Remove debug output (to stderr) accidentially included in
 -    last version.
+   * export: Added --from option.
+   * Special remotes configured with exporttree=yes annexobjects=yes 
+     can store objects in .git/annex/objects, as well as an exported tree.
+   * Support proxying to special remotes configured with 
+     exporttree=yes annexobjects=yes.
+   * post-retrieve: When proxying is enabled for an exporttree=yes
+     special remote and the configured remote.name.annex-tracking-branch
+     is received, the tree is exported to the special remote.
+   * updateproxy, updatecluster: Prevent using an exporttree=yes special
+     remote that does not have annexobjects=yes, since it will not work.
+   * git-remote-annex: Store objects in exportree=yes special remotes
+     in the same paths used by annexobjects=yes.
 -  * When proxying an upload to a special remote, verify the hash.
 -  * Avoid loading cluster log at startup.
++
++ -- Joey Hess <id@joeyh.name>  Wed, 31 Jul 2024 15:52:03 -0400
++
 +git-annex (10.20240808) upstream; urgency=medium
 +
 +  * Remove debug output (to stderr) accidentially included in
 +    last version.
    * When getting from a P2P HTTP remote, prompt for credentials when
      required, instead of failing.
 +  * When proxying an upload to a special remote, verify the hash.
 +  * Avoid loading cluster log at startup.
  
 - -- Joey Hess <id@joeyh.name>  Wed, 31 Jul 2024 15:52:03 -0400
 + -- Joey Hess <id@joeyh.name>  Thu, 08 Aug 2024 15:26:26 -0400
  
  git-annex (10.20240731) upstream; urgency=medium