Merge branch 'master' into smudge

This commit is contained in:
Joey Hess 2015-12-09 17:58:59 -04:00
commit bf98d2bd77
Failed to extract signature
11 changed files with 148 additions and 24 deletions

5
debian/changelog vendored
View file

@ -1,3 +1,4 @@
* 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
@ -8,7 +9,7 @@
filter. Note that this changes the default behavior of git add in a
newly initialized repository; it will add files to the annex.
git-annex (5.20151117) UNRELEASED; urgency=medium
git-annex (5.20151208) unstable; urgency=medium
* Build with -j1 again to get reproducible build.
* Display progress meter in -J mode when copying from a local git repo,
@ -33,7 +34,7 @@ git-annex (5.20151117) UNRELEASED; urgency=medium
* Fix reversion in handling of long filenames, particularly when using
addurl/importfeed, which was introduced in the previous release.
-- Joey Hess <id@joeyh.name> Mon, 16 Nov 2015 16:49:34 -0400
-- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400
git-annex (5.20151116) unstable; urgency=medium