X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=07dbba6e668096e883b4d6797f25f991639baac2;hb=e31362aa5853ada39b14be5bbdc46cbda58e20a6;hp=08b3e32364e685173de9f63acb7699bc52021ee7;hpb=50048b4c1c41e1471cdc7054bed02ff30418ea44;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 08b3e323..07dbba6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,27 @@
-dgit (2.4~) unstable; urgency=low
+dgit (2.5~) unstable; urgency=medium
 
-  * 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.
+  * dgit-maint-merge(7): New tutorial manpage from Sean Whitton.
+
+ --
+
+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