Merge branch 'stable'

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5d78d25911eba202f980533ceb0f67bb6a471abf..1d57cfa9e610ca1397866cdd0877b678599c27d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,24 @@
+dgit (4.1~) experimental; urgency=medium
+
+  Internal changes:
+  * using-these: New script to help with ad-hoc-testing.
+
+ --
+
+dgit (4.0) experimental; urgency=low
+
+  * dgit: --deliberately-not-fast-forward works properly in
+    split view quilt modes (suppressing the pseudomerge).
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 12 Feb 2017 22:22:31 +0000
+
 dgit (3.12~) unstable; urgency=medium
 
   Important bugfixes to dgit:
   * Pass --no-renames to git diff-tree -z, avoiding potential trouble.
+  * Defend against commit subject lines which would generate patches which
+    look like series files, etc.  Involves adding .patch to all generated
+    patch filenames.
 
  --