reorder

1 files changed, 14 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index f1a54eaab..f19b7141e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 git-annex (6.20160419) UNRELEASED; urgency=medium
 
+  * Fix bug that prevented resuming of uploads to encrypted special remotes
+    that used chunking.
+  * That bug could also expose the names of keys to such remotes when
+    attempting to resume an upload, so it is a minor security issue.
   * Fix duplicate progress meter display when downloading from a git remote
     over http with -J.
-  * Avoid setting LOCPATH in linux standalone builds now that ghc has been
-    fixed to not hang when it cannot find locale files.
   * reinject: When src file's content cannot be verified, leave it alone,
     instead of deleting it.
   * reinject: Added new mode which can reinject known files into the annex.
@@ -12,19 +14,19 @@ git-annex (6.20160419) UNRELEASED; urgency=medium
     to refer to a file.
   * Fix bug that prevented annex.sshcaching=false configuration from taking
     effect when on a crippled filesystem. Thanks, divergentdave.
-  * Isolate test suite from global git config settings.
+  * git 2.8.2 is going to prevent git merge from merging in unrelated
+    branches. Since the webapp's pairing etc features often combine
+    together repositories with unrelated histories, work around
+    this behavior change when the assistant merges, by passing
+    --allow-unrelated-histories. Note though that this is not done
+    for git annex sync's merges, so it will follow git's default or
+    configured behavior.
   * When git-annex is used with a git version older than 2.2.0, disable
     support for adjusted branches, since GIT_COMMON_DIR is needed to update
     them and was first added in that version of git.
-  * git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from
-    merging in unrelated branches. Since the webapp's pairing etc features
-    often combine together repositories with unrelated histories, work around
-    this behavior change when the assistant merges. Note though that this is
-    not done for git annex sync's merges, so it will follow git's default or
-    configured behavior.
-  * Fix bug that prevented resuming of uploads to encrypted special remotes
-    that used chunking. This bug could also expose the names of keys to
-    such remotes.
+  * Avoid setting LOCPATH in linux standalone builds now that ghc has been
+    fixed to not hang when it cannot find locale files.
+  * Isolate test suite from global git config settings.
 
  -- Joey Hess <id@joeyh.name>  Tue, 19 Apr 2016 12:57:15 -0400