Merge branch 'master' into watch
Conflicts: debian/changelog git-annex.cabal
This commit is contained in:
commit
2e5ea30981
9 changed files with 75 additions and 23 deletions
4
debian/changelog
vendored
4
debian/changelog
vendored
|
@ -3,8 +3,10 @@ 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.
|
||||
* 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, 05 Jun 2012 20:25:51 -0400
|
||||
-- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400
|
||||
|
||||
git-annex (3.20120611) unstable; urgency=medium
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue