diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-11 12:13:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-11 12:13:07 -0400 |
| commit | a5a3cd55ac2bab656824e48d29ead8382c583b01 (patch) | |
| tree | 1d5503b35e7fdb27bcd2e1e3f8f1020686882125 /debian | |
| parent | 433ff41496b073c71e465af8b38b2ecafe27d8dd (diff) | |
| parent | 5642e189b76070b43a8e24f9f49d36b950f83c8d (diff) | |
Merge branch 'master' into watch
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8c2c68119..4ea0f46ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |