diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-12 13:37:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-12 13:37:17 -0400 |
| commit | 2e5ea30981251fbdce38e18f3521917742c892a3 (patch) | |
| tree | d7c94a33061949007dada9d7cda5b0b748a4e8b4 /debian | |
| parent | 942d8f72984377c4e69d7c55877621d434e5d687 (diff) | |
| parent | 4ebb0b51d77484fcee12fd92a71b737b1aaca283 (diff) | |
Merge branch 'master' into watch
Conflicts:
debian/changelog
git-annex.cabal
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4ea0f46ac..60a42dcde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |