diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-05 17:12:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-05 17:12:05 -0400 |
| commit | 5edba1bfe62ac4e77906b5b0057280d2d616c61e (patch) | |
| tree | 9fa17a7e67fa3d3159318a4a318c55938327020f /debian | |
| parent | dc7c9a5db72ff05d5eb835f2406f2626a33553df (diff) | |
assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.
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 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 |