diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-21 17:12:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-21 17:12:46 -0400 |
| commit | 80af78f48eb59fa33849eedc5779e3649328cde0 (patch) | |
| tree | 6034ff3761f206c7cea50008fb9092bc43e81283 /debian | |
| parent | 4263eb776a3b81354c77d2a1b3fd997ed85f1c3c (diff) | |
| parent | ae0059cac6a403cbeae66483a363fe64025beb69 (diff) | |
Merge branch 'master' into smudge
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index f323b4b5a..0488c2eb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,17 @@ git-annex (6.20151225) unstable; urgency=medium -- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400 -git-annex (5.20151209) UNRELEASED; urgency=medium +git-annex (5.20151219) UNRELEASED; urgency=medium + + * status: On crippled filesystems, was displaying M for all annexed files + that were present. Probably caused by a change to what git status + displays in this situation. Fixed by treating files git thinks are + modified the same as typechanged files. + * addurl: Added --batch option. + + -- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 13:31:17 -0400 + +git-annex (5.20151218) unstable; urgency=medium * Add S3 features to git-annex version output. * webdav: When testing the WebDAV server, send a file with content. @@ -28,7 +38,7 @@ git-annex (5.20151209) UNRELEASED; urgency=medium in a corrupted git repository. * Fix potential denial of service attack when creating temp dirs. - -- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400 + -- Joey Hess <id@joeyh.name> Fri, 18 Dec 2015 12:09:33 -0400 git-annex (5.20151208) unstable; urgency=medium |