dgit: Set up a merge driver for debian/changelog. Closes:#769291.

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index ef2c8423d152c079c4a1867711399004de31a815..9e8f572946ace82064a3249205c11dada4a009ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,10 @@ dgit (0.23~) unstable; urgency=low
   * Document in manpage under `dgit push' that it is best to build with
     dgit too.  Closes:#763333.
 
+  * When receiving a push with dgit-repos-server, update the server's
+    refs/heads/master if we are pushing to what the distro regards as a
+    relevant branch, and the push would ff master.  Closes:#728209.
+
   * Fix inaccurate error message when archive's git hash is not an
     ancestor of git repo's git hash.
 
@@ -91,6 +95,9 @@ dgit (0.23~) unstable; urgency=low
   * Change realpath dependency to `coreutils (>= 8.23-1~) | realpath'
     (Closes:#786955.)
   * For non-Debian distros, debiantag() uses distro name a la DEP-14.
+  * dgit: Be more careful about tag updates during fetch: only update
+    tags referring to uploads to distro we are trying to fetch from.
+  * dgit: Set up a merge driver for debian/changelog.  Closes:#769291.
 
  --