summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ddb7b401..701f07e53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ git-annex (5.20140614) UNRELEASED; urgency=medium
for git-annex branch commits and commits made by the assistant.
* Fix memory leak when committing millions of changes to the git-annex
branch, eg after git-annex add has run on 2 million files in one go.
+ * assistant: Fix bug, introduced in last release, that caused the assistant
+ to make many unncessary empty merge commits.
-- Joey Hess <joeyh@debian.org> Mon, 16 Jun 2014 11:28:42 -0400