mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into watch

Browse source
This commit is contained in:
Joey Hess 2012-06-05 14:53:38 -04:00
commit 78f5f90c24
9 changed files with 95 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
debian/changelog vendored
View file

@ -1,4 +1,4 @@
git-annex (3.20120523) UNRELEASED; urgency=low
git-annex (3.20120605) unstable; urgency=low
* sync: Show a nicer message if a user tries to sync to a special remote.
* lock: Reset unlocked file to index, rather than to branch head.
@ -8,8 +8,9 @@ git-annex (3.20120523) UNRELEASED; urgency=low
unsupported backend.
* Require that the SHA256 backend can be used when building, since it's the
default.
* Preserve parent environment when running hooks of the hook special remote.
-- Joey Hess <joeyh@debian.org> Sun, 27 May 2012 20:55:29 -0400
-- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 14:03:39 -0400
git-annex (3.20120522) unstable; urgency=low