X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Fchangelog;h=75515ee2577ea771e7f492228151f2289e045994;hp=203a864ce9a075091819268d411ea9b27d08c40b;hb=19669291927ee91dbea3c47a412161b32859df88;hpb=ef933efbf46dce39eafd0a4bda51a180ed0c541e

diff --git a/debian/changelog b/debian/changelog
index 203a864c..75515ee2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+dgit (2.5~) unstable; urgency=medium
+
+  * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.
+  * Test suite bugfixes.
+  * Test suite: Introduce setup/gnupg, to work around #841143
+    and improve performance by amortising gnupg migration cost.
+  * Switch to new archive/ tag format by default, even in
+    non-split-brain mode.
+
+ --
+
+dgit (2.4) unstable; urgency=low
+
+  Bugfixes:
+  * split brain cache: Fix a wrong implicit reference to $_.
+    Closes:#841383.
+  * split brain cache: Make sure to write reflog entries for cache updates
+    even if the eventual tree (and therefore commit) is the same.
+    Otherwise, after updating dgit, the cache might have the right answer
+    but not be refreshed even by a build.
+  * dgit gbp-build: No longer invent a --git-debian-branch option.
+    Usually the user is a maintainer using split brain, and we should rely
+    on their own gbp configuration to specify the right check.
+    Closes:#841100.
+
+  Minor docs fix:
+  * dgit(1): Document which --ch: options are a good idea.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 20 Oct 2016 16:31:54 +0100
+
+dgit (2.3) unstable; urgency=low
+
+  * With --overwrite, do not check all sorts of tags (which may
+    not exist, or might contain wrong things).  Closes:#841101.
+  * When generating pseudomerge in quilt split brain mode due to
+    --overwrite, actually include the version number in the commit
+    message.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 18 Oct 2016 01:58:05 +0100
+
 dgit (2.2) unstable; urgency=low
 
   * Fix config relating to Debian to actually make split brain mode
@@ -5,7 +45,7 @@ dgit (2.2) unstable; urgency=low
   * Detect SIGPIPE (and SIGCHLD) being blocked or ignored.
     Closes:#841085.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 17 Oct 2016 17:31:18 +0100
 
 dgit (2.1) unstable; urgency=low