From: Joey Hess Date: Thu, 10 Dec 2015 18:07:11 +0000 (-0400) Subject: Merge branch 'master' into smudge X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~320^2~184^2~70 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3d936fdb59b4af8565ab914eb2ea860e98b47e92;p=git-annex.git Merge branch 'master' into smudge --- 3d936fdb59b4af8565ab914eb2ea860e98b47e92 diff --cc debian/changelog index ed1e32b735,e12c9a5fea..e3ee9a34ad --- a/debian/changelog +++ b/debian/changelog @@@ -1,17 -1,9 +1,23 @@@ +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. + + -- Joey Hess Tue, 08 Dec 2015 11:14:03 -0400 + + git-annex (5.20151209) UNRELEASED; urgency=medium + + * Add S3 features to git-annex version output. + + -- Joey Hess Thu, 10 Dec 2015 11:39:34 -0400 + git-annex (5.20151208) unstable; urgency=medium * Build with -j1 again to get reproducible build.