summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-09 15:18:00 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-09 15:18:00 -0400
commit06acd390fbc2340c5878cbf3831e058f71080988 (patch)
tree968f07a1746b72df9656a4fd390d28415b502f1a /debian
parent7a62581096d328a0403944286125c1bab8be0edc (diff)
Really fix bug that caused the assistant to make many unncessary empty merge commits.
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 294e404df..817c31612 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ git-annex (5.20140708) UNRELEASED; urgency=medium
repository to be removed. It should be able to recover repositories
experiencing this bug without data loss. See:
http://git-annex.branchable.com/bugs/bad_merge_commit_deleting_all_files/
+ * Really fix bug that caused the assistant to make many unncessary
+ empty merge commits.
-- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400