Overwrite: Document --overwrite=VERSION

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5842873fc72c462962c6f4937ba4f37ac1c3962d..625feddafc16502a0fadaa8b31390b2603b01fea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,12 @@ dgit (1.5~~) unstable; urgency=medium
     Instead, insist on a single one.
   * dgit sbuild no longer deletes extranious .changes files; instead
     we rely on --rm-old-changes, or failing that, fail early.
+  * When doing quilt linearisation, treat upstream .gitignores not
+    in the toplevel the same way we treat ones in the toplevel.
+  * When automatically generating quilt patch, honour GIT_COMMITTER_DATE
+    for filename creation (makes filename deterministic in test suite).
+  * New --overwrite option, replaces need to for user to use
+    git merge -s ours.  Closes:#838718.
 
   Infrastructure:
   * Better error handling in dgit-repos-policy-debian.
@@ -42,6 +48,9 @@ dgit (1.5~~) unstable; urgency=medium
     messages.  Closes:#800078.
   * Pass --ch:* and -v options to dpkg-buildpackage when building
     source.  Fixes bad Perl poetry syntax.  Closes:#829121.
+  * When synthesing a commit from a .dsc from the archive, stop
+    internal git reset from printing a confusing message about HEAD.
+  * Turn off git gc in the private working areas.
 
   Test suite:
   * When sbuild fails, do not crash due to sed not finding the log
@@ -60,6 +69,7 @@ dgit (1.5~~) unstable; urgency=medium
     different test case git working tree tarballs.
   * Test dgit-repos-policy-debian with multiple (identical, as it happens)
     existing taints.
+  * Provide better log output for certain failures.
 
  --