X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Fchangelog;h=4754f17085eddbc68b075dae28aade76014824a4;hb=507dba18d8e6c102c69dac1cd83d76d821a6cf2f;hp=66aa5e9ec91023d5c4951073196eafb2f188e2ec;hpb=3ab702cf007572af5419a92d3688c0bb59013a82;p=dgit.git

diff --git a/debian/changelog b/debian/changelog
index 66aa5e9e..4754f170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,23 @@
-dgit (3.5~) unstable; urgency=medium
+dgit (3.6~) unstable; urgency=medium
 
-  Bugfixes:
-  * Improve comment left in .git/info/attributes.
+  * 
 
  --
 
+dgit (3.5) unstable; urgency=medium
+
+  Bugfixes:
+  * gitattributes: Defuse gitattributes in private working area even if we
+    don't do it in the user's tree (because of user configuration).
+  * gitattributes: When cloning, do not print spurious warning about
+    actually-defused gitattributes.  Closes:#851624.
+  * gitattributes: Improve comment left in .git/info/attributes.
+
+  Test suite:
+  * gitattributes: Many improvements to test case.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 17 Jan 2017 22:36:01 +0000
+
 dgit (3.4) unstable; urgency=low
 
   Test suite: