summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog16
1 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6c5430a95..7e3b1514e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+git-annex (6.20151225) unstable; urgency=medium
+
+ * annex.version increased to 6, but version 5 is also still supported.
+ * The upgrade to version 6 is not done fully automatically, because
+ upgrading a direct mode repository to version 6 will prevent old
+ versions of git-annex from working in other clones of that repository.
+ * smudge: New command, used for git smudge filter.
+ This will replace direct mode.
+ * init: Configure .git/info/attributes to use git-annex as a smudge
+ filter. Note that this changes the default behavior of git add in a
+ newly initialized repository; it will add files to the annex.
+ * unlock, lock: In v6 mode, unlocking a file changes it from a symlink to a
+ pointer file, and this change can be committed to the git repository.
+
+ -- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400
+
git-annex (5.20151209) UNRELEASED; urgency=medium
* Add S3 features to git-annex version output.