Merge branch 'master' into watch

This commit is contained in:
Joey Hess 2012-06-07 13:48:55 -04:00
commit 727158ff55
11 changed files with 93 additions and 22 deletions

1
debian/changelog vendored
View file

@ -5,6 +5,7 @@ git-annex (3.20120606) UNRELEASED; urgency=low
to manually run git commands when manipulating files.
* add: Prevent (most) modifications from being made to a file while it
is being added to the annex.
* initremote: Automatically describe a remote when creating it.
-- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 20:25:51 -0400