diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-07 12:29:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-07 12:29:34 -0400 |
| commit | 6a44b7716aa702a068b301cc8608c0116a5cd90f (patch) | |
| tree | 8773d46c1bd73117cfd09857dcc28ad74554f9b5 /debian | |
| parent | cf9af38cf75618e2953c5b537d8f7c1fe353aa63 (diff) | |
| parent | 4542ddaf4e58da6d02d41e6365d68506df8ccd4c (diff) | |
Merge branch 'master' into smudge
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 5fde37c88..87affe138 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,3 @@ -git-annex (6.20151117) UNRELEASED; 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 @@ -9,6 +7,9 @@ git-annex (6.20151117) UNRELEASED; urgency=medium * 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. + +git-annex (5.20151117) UNRELEASED; urgency=medium + * Build with -j1 again to get reproducible build. * Display progress meter in -J mode when copying from a local git repo, to a local git repo, and from a remote git repo. @@ -29,6 +30,8 @@ git-annex (6.20151117) UNRELEASED; urgency=medium This was a reversion caused by the relative path changes in 5.20150113. * dropunused: Make more robust when trying to drop an object that has already been dropped. + * 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 |