Merge branch 'master' into watch

This commit is contained in:
Joey Hess 2012-06-15 15:20:11 -04:00
commit 53d2e81ffd
22 changed files with 249 additions and 24 deletions

11
debian/changelog vendored
View file

@ -1,12 +1,19 @@
git-annex (3.20120612) UNRELEASED; urgency=low
git-annex (3.20120616) 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, 12 Jun 2012 11:35:59 -0400
git-annex (3.20120614) unstable; urgency=medium
* addurl: Was broken by a typo introduced 2 released ago, now fixed.
Closes: #677576
* Install man page when run by cabal, in a location where man will
find it, even when installing under $HOME. Thanks, Nathan Collins
-- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400
-- Joey Hess <joeyh@debian.org> Thu, 14 Jun 2012 20:21:29 -0400
git-annex (3.20120611) unstable; urgency=medium