Overwrite: Document --overwrite=VERSION

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ce449c7e4b8b47f792202b4f1b0fe7a86961007a..625feddafc16502a0fadaa8b31390b2603b01fea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ dgit (1.5~~) unstable; urgency=medium
     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.
@@ -46,6 +50,7 @@ dgit (1.5~~) unstable; urgency=medium
     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