diff options
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6d151ee08..294e404df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ git-annex (5.20140708) UNRELEASED; urgency=medium * Fix git version that supported --no-gpg-sign. * Fix bug in automatic merge conflict resolution, when one side is an annexed symlink, and the other side is a non-annexed symlink. + * Fix race in direct mode merge code that could cause all files in the + 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/ -- Joey Hess <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400 |