X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=058ce000cacf9c7f458a3a4d28bf0994e36f7a32;hb=625ef9cc461653073175be47c4b6a2a9e25c13d1;hp=98c0383715ec1a1a70ad2a2d1b1aef3e84db62d5;hpb=dea27c626d6c39d11a1b591005fd2e6e2a17e295;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 98c03837..058ce000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ dgit (6.7~) unstable; urgency=medium
     not in series, because they will be deleted.  Closes:#904997.
   * changelog: Add close note for #905400 to changelog entry for 6.5.
   * git-debrebase: convert-from-gbp: Improve messages.  Closes:#906641.
+  * git-debrebase: Highly experimental merge resolution support,
+    enabled only with special command line option.
+  * git-debrebase: Check in convert-from-* whether ffq-prev or
+    debrebase-last indicate that we are already in gdr format.
+  * git-debrebase: convert-from-*: leave debrebase-last refs to
+    hint to everyone that this is now a gdr branch.
 
  --