X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=af4893b1eb9d8bc13ace2c638adf1d448bb12d04;hp=e84fcd455e3886fa7ba2de3aec281b78758c785d;hb=dc2d5ffb3627335e6522ddb7bf526880dc699762;hpb=78e5dd0ee7b99e4904822723cdf73245b24a2d83

diff --git a/debian/changelog b/debian/changelog
index e84fcd45..af4893b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,19 @@
 dgit (2.5~) unstable; urgency=medium
 
-  * 
+  Substantive changes:
+  * Do not crash in split brain quilt modes when the two brains are
+    actually identical.  (Eg --quilt=gbp with no patches.)  Closes:#841770.
+  * Switch to new archive/ tag format by default, even in
+    non-split-brain mode.
+  * Provide --gbp and --dpm as aliases for --quilt=gbp and --quilt=dpm.
+
+  Documentation:
+  * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.
+
+  Test suite:
+  * Introduce setup/gnupg, to help work around gnupg2 bug #841143
+    and improve performance by amortising gnupg migration cost.
+  * Various bugfixes.
 
  --