diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-05 14:53:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-05 14:53:38 -0400 |
| commit | 78f5f90c2495a5e30c0620816e2937567cd76ec0 (patch) | |
| tree | 1ac9d578724f6fc9eb6cf12f706bafaf8f1fe4da /debian | |
| parent | cbdaccd44aa8f0ca30afba23fc06dd244c242075 (diff) | |
| parent | e771c645595fb6cedf0f0c5f2af393712013deb2 (diff) | |
Merge branch 'master' into watch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 52f6c3b97..fd4f7b98b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-annex (3.20120523) UNRELEASED; urgency=low +git-annex (3.20120605) unstable; urgency=low * sync: Show a nicer message if a user tries to sync to a special remote. * lock: Reset unlocked file to index, rather than to branch head. @@ -8,8 +8,9 @@ git-annex (3.20120523) UNRELEASED; urgency=low unsupported backend. * Require that the SHA256 backend can be used when building, since it's the default. + * Preserve parent environment when running hooks of the hook special remote. - -- Joey Hess <joeyh@debian.org> Sun, 27 May 2012 20:55:29 -0400 + -- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 14:03:39 -0400 git-annex (3.20120522) unstable; urgency=low |