From 5edba1bfe62ac4e77906b5b0057280d2d616c61e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Jul 2014 17:12:05 -0400 Subject: assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/changelog') 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 Mon, 16 Jun 2014 11:28:42 -0400 -- cgit v1.2.3