pseudomerge: When generating pseudomerge in quilt split brain mode due to --overwrite...

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5d05bf543b295f2934554716d9818b3adb3849fd..88ec5bbd1b9c26fe14967c26460d5a517e2aad9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,32 @@
-dgit (2.1~~) unstable; urgency=medium
+dgit (2.3~) unstable; urgency=medium
 
-  * 
+  * When generating pseudomerge in quilt split brain mode due to
+    --overwrite, actually include the version number in the commit
+    message.
 
  --
 
+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: