summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-05 00:10:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-05 00:10:43 -0400
commitab2aacb24de0d411e96aee0fab056469b071c26c (patch)
tree0806934923747280b6c93e48dd3dd85c1880f546 /debian
parent9c036187654200617dbebc14470e5ba4a2cb751c (diff)
highlight the syntax change
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 2 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 1f2a04d2e..b102ea443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
git-annex (4.20130828) UNRELEASED; urgency=low
+ * initremote: Syntax change when setting up an encrypted special remote.
+ Now use keyid=$KEYID rather than the old encryption=$KEYID
* forget: New command, causes git-annex branch history to be forgotten
in a way that will spread to other clones of the repository.
(As long as they're running this version or newer of git-annex.)
@@ -11,9 +13,6 @@ git-annex (4.20130828) UNRELEASED; urgency=low
from feeds.
* Honor core.sharedrepository when receiving and adding files in direct
mode.
- * initremote: Syntax change when setting up encrypted special remote.
- Now use: encryption=hybrid keyid=$KEYID
- (Thanks, guilhem for the patch.)
* enableremote: gpg keys can be removed from those a remote encrypts
to by passing "keyid-=$KEYID". keyid+= is also provided, although
"encryption=$KEYID" can also be used as always.