summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-05 11:15:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-05 11:15:06 -0400
commitf2b3b318126cacfb3e85c4d75ab35df995874d73 (patch)
treea77130b3003c46b47d5a5775eb87131850789c48 /debian
parentc4990a41c430d541cefe27a53a39e7eb60e217a8 (diff)
fix
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b102ea443..bf715455a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,7 @@ git-annex (4.20130828) UNRELEASED; urgency=low
* Honor core.sharedrepository when receiving and adding files in direct
mode.
* 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.
+ to by passing "keyid-=$KEYID". keyid+= is also provided.
(Thanks, guilhem for the patch.)
* Added encryption=pubkey scheme, which encrypts to public keys directly
rather than the hybrid approach. See documentation for advantages