split brain cache: Fix a wrong implicit reference to $_. Closes:#841383.

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 203a864ce9a075091819268d411ea9b27d08c40b..99e724d00609a33b5d6e2839c6b55e0537b1603f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+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
@@ -5,7 +26,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