Merge branch 'master' into watch

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2012-06-11 12:13:07 -04:00
commit a5a3cd55ac
10 changed files with 117 additions and 23 deletions

10
debian/changelog vendored
View file

@ -1,13 +1,19 @@
git-annex (3.20120606) UNRELEASED; urgency=low
git-annex (3.20120612) UNRELEASED; urgency=low
* watch: New subcommand, which uses inotify to watch for changes to
files and automatically annexes new files, etc, so you don't need
to manually run git commands when manipulating files.
-- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 20:25:51 -0400
git-annex (3.20120611) unstable; urgency=medium
* 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.
* uninit: Refuse to run in a subdirectory. Closes: #677076
-- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 20:25:51 -0400
-- Joey Hess <joeyh@debian.org> Mon, 11 Jun 2012 10:32:01 -0400
git-annex (3.20120605) unstable; urgency=low