X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=99e724d00609a33b5d6e2839c6b55e0537b1603f;hb=63f314691709644c0fb60c9ae4942f75714e4255;hp=b0f53e327785195dee17e109826d8909458d3b32;hpb=b49092567e74794274ee5c1b1f3939d4cb70d407;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index b0f53e32..99e724d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,46 @@
-dgit (2.0~~) unstable; urgency=low
+dgit (2.4~) unstable; urgency=low
+
+  * 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.
+  * split brain cache: Fix a wrong implicit reference to $_.
+    Closes:#841383.
+
+ --
+
+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:
+       dgit: failed command: dpkg-parsechangelog --format rfc822 --all
+       dgit: subprocess died due to fatal signal PIPE
+  * git- prefixes: Fix some occurrences of `git-foo' in infrastructure,
+    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
 
   Incompatible change:
   * dgit sbuild: does not pass -A to sbuild.  Consequently the default
@@ -123,7 +165,7 @@ dgit (2.0~~) unstable; urgency=low
     does, now).
   * Do not fail when git requires --allow-unrelated-histories.
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Oct 2016 11:45:48 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 16 Oct 2016 12:12:50 +0100
 
 dgit (1.4) unstable; urgency=high