dgit: quilt fixup: Maybe mention gitattributes

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 98c0383715ec1a1a70ad2a2d1b1aef3e84db62d5..c17232fcd5b53c6966d37c23b683939bdf546074 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,25 @@ 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.
+  * git-debrebase: Provide hints for unprocessable commits, depending
+    on the apparent branch ffq state, including possible suggestion
+    to use convert-from-*.  Closes:#905005.  Closes:#905279.
+  * dgit: Mention bad origs as possible cause of quilt fixup failure,
+    in both dgit(7) and in error messages.  No longer suggest
+    --quilt=smash or dpkg-source --commit in the error message.
+    Closes:906196.
+  * dgit: Do not suggest --quilt modes if quilt fixup "stopped at"
+    a commit made by git-debrebase.  Closes:#906197.
+  * dgit(1), dgit(7): Document that we do not suppress attributes
+    which affect git-archive.  This is related to #906199.
+  * dgit: Mention gitattributes as a potential problem in quilt
+    linearisation failure, when appropriate.  Closes:#906199.
 
  --