Merge branch 'master' into watch

This commit is contained in:
Joey Hess 2012-06-05 20:30:37 -04:00
commit a7a729bce4
13 changed files with 93 additions and 63 deletions

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
git-annex (3.20120606) UNRELEASED; urgency=low
* add: Prevent (most) modifications from being made to a file while it
is being added to the annex.
-- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 20:25:51 -0400
git-annex (3.20120605) unstable; urgency=low
* sync: Show a nicer message if a user tries to sync to a special remote.