reorg

diff --git a/CHANGELOG b/CHANGELOG
index 06f7e77b3bbb47c4ea76ccfd16d7770eba5387b6..aaaa508b71bbfdf67b4dcabd03072a97659b9d48 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,26 +3,29 @@ git-annex (8.20201128) UNRELEASED; urgency=medium
   * New config annex.stalldetection, remote.name.annex-stalldetection,
     which can be used to deal with remotes that stall during transfers,
     or are sometimes too slow to want to use.
-  * Fix hang on shutdown of external special remote using ASYNC protocol
-    extension. (Reversion introduced in version 8.20201007.)
+  * Support special remotes that are configured with importtree=yes but
+    without exporttree=yes.
   * Fix bug that made the next download after an empty file from a ssh
     or tor remote fail.
   * Avoid spurious "verification of content failed" message when downloading
     content from a ssh or tor remote fails due to the remote no longer
     having a copy of the content.
-  * Support special remotes that are configured with importtree=yes but
-    without exporttree=yes.
+  * Fix bug that matched include= and exclude= in preferred/required content
+    expressions relative to the current directory, rather than the path
+    from the top of the repository.
+    (Reversion introduced in version 8.20201116.)
+  * Fix hang on shutdown of external special remote using ASYNC protocol
+    extension. 
+    (Reversion introduced in version 8.20201007.)
   * Guard against running in a repo where annex.uuid is set but
     annex.version is not set, or vice-versa.
   * Avoid autoinit when a repo does not have annex.version or annex.uuid
     set, but has a git-annex objects directory, suggesting it was used
     by git-annex before, and the git config may have been lost.
-  * Fix reversion in 8.20201116 that made include= and exclude= in
-    preferred/required content expressions match a path relative to the
-    current directory, rather than the path from the top of the repository.
   * importfeed: Avoid using youtube-dl when a feed does not contain an
     enclosure, but only a link to an url which youtube-dl does not support.
-  * initremote: Prevent enabling encryption with exporttree=yes/importtree=yes.
+  * initremote: Prevent enabling encryption with exporttree=yes or 
+    importtree=yes.
 
  -- Joey Hess <id@joeyh.name>  Mon, 30 Nov 2020 12:55:49 -0400