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

diff --git a/debian/changelog b/debian/changelog
index 505f3927..e84fcd45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,48 @@
-dgit (2.1~~) unstable; urgency=medium
+dgit (2.5~) unstable; urgency=medium
+
+  * 
+
+ --
+
+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
+    work.  Closes:#841085.
+  * 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
 
   * Do not crash due in clone to failure to handle dpkg-parsechangelog
     SIGPIPE.  Closes:#840989.  Avoids:
@@ -8,7 +52,7 @@ dgit (2.1~~) unstable; urgency=medium
     messages, and test suite.  Filter out .../git-core from PATH in
     test suite so that we catch future occurrences.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Oct 2016 19:05:14 +0100
 
 dgit (2.0) unstable; urgency=low