summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8fc917235..1efbdd9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ git-annex (5.20141232) UNRELEASED; urgency=medium
Closes: #774494
* Fix build with process 1.2.1.0.
* Android: Provide a version built with -fPIE -pie to support Android 5.0.
+ * sync: Fix an edge case where syncing in a bare repository would try to
+ merge and so fail.
-- Joey Hess <id@joeyh.name> Fri, 02 Jan 2015 13:35:13 -0400