diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-17 08:22:43 -0700 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-17 08:22:43 -0700 |
| commit | dcd208513d24c609719065c51eb176f6b0df3024 (patch) | |
| tree | 035865be9e0812fb5e01d8abadb5159d924966e5 /debian | |
| parent | 95bfbcd3e3952dc1e22fbc313394c54c3ababad4 (diff) | |
| parent | fe8fee235b11e58cfda7e8a09e120b0daabe3f43 (diff) | |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a5a1f1134..ef3c21cf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (3.20120808) UNRELEASED; urgency=low * S3: Add fileprefix setting. + * Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt. * init: If no description is provided for a new repository, one will automatically be generated, like "joey@gnu:~/foo" |