Overwrite: Document --overwrite=VERSION

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7143fe7d5b222cbc6782efd41e20e36fa1e371fe..625feddafc16502a0fadaa8b31390b2603b01fea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ dgit (1.5~~) unstable; urgency=medium
     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.