diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-01 19:12:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-01 19:12:25 -0400 |
| commit | 04adde9fa47297d6549419513cfddbd785dc2de1 (patch) | |
| tree | c6a2e1db43fa4942aef8ba4e2a7d608a8872d92b /debian | |
| parent | 2e3990d125b96a13545b55a203f41e3bf09e75e3 (diff) | |
| parent | c843ade78f57bdfe7bed5f77749c71f9a9e6e20a (diff) | |
Merge branch 'sshgcrypt'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6727315c0..f7c79e6ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ git-annex (4.20130921) UNRELEASED; urgency=low written by MacGPG. * assistant: More robust inotify handling; avoid crashing if a directory cannot be read. + * Disable receive.denyNonFastForwards when setting up a gcrypt special + remote, since gcrypt needs to be able to fast-forward the master branch. -- Joey Hess <joeyh@debian.org> Sun, 22 Sep 2013 19:42:29 -0400 |