X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=3ac55a0b693b2354e101fc8fe8b3e058ad46ee5f;hb=8f28dfa084b6d63e385d7fe538214eee2f90ea9e;hp=325d37fcb7f1b8174f403e7d4f097ba3744e1810;hpb=ea212c7ae3fabab519aefe16cbc24a8911be134f;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 325d37fc..3ac55a0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,25 @@ dgit (6.7~) unstable; urgency=medium
 
   * git-debrebase: Improve ffq head recording message.
   * git-debrebase: Better (less copious by default) debug output.
+  * git-debrebase: Do not bail making patches if there aren't any.
+  * test suite: Set DEBFULLNAME
+  * git-debrebase: scrap works properly when it does only rebase --abort.
+  * dgit(1): Encourage --overwrite rather than --overwrite=version.
+  * test suite: unset GIT_EDITOR, so it works if user has that set.
+  * git-debrebase: Improve laundry performance by a factor of ~55:1,
+    and analysis performance by factor of ~4.2:1.  Closes:#905995.
+  * git-debrebase: `prepush' is now a silent no-op if the branch is
+    unstitched.  This is more friendly.
+  * git-debrebase: On rebase, always save ffq-prev even if we were
+    both stitched and laundered.  Closes:#905975.
+  * git-debrebase: convert-from-*: Snag on patches in d/patches which are
+    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.
 
  --
 
@@ -20,7 +39,7 @@ dgit (6.5) unstable; urgency=medium
   * git-debrebase: New subcommand `scrap'.  Closes:#905063.
 
   git-debrebase error handling improvements:
-  * git-debrebase: Properly reject bare dgit dsc imports
+  * git-debrebase: Properly reject bare dgit dsc imports.  Closes:905400.
   * git-debrebase: Improve some error message formatting.
   * git-debrebase: Check for git-rebase in progress and abort most operations.