Merge branch 'master' into wip.remote

[dgit.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 4ea1aea85f2f4d8d5c03220b79f1d0d816ea25c5..f57b4acd78cd1028459476d2aa46c25517a9f8ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+dgit (0.18~experimental2) experimental; urgency=low
+
+  * Merge in accidentally-dropped changes from 0.17~experimental7.
+  * Merge bugfix from master (unstable/testing) branch.
+
+ --
+
+dgit (0.17) unstable; urgency=high
+
+  * Do not grobble around in .git/refs/; instead, use git-show-ref.
+    This avoids breaking when git makes packed refs.  Closes:728893.
+  * Clarify error message for missing refs/remotes/dgit/dgit/<suite>.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 07 Nov 2013 00:02:47 +0000
+
 dgit (0.18~experimental1) experimental; urgency=low
 
   * No update to code.