Changelog
git-annex (5.20140709) unstable; urgency=medium
* 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/
* 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.
* Really fix bug that caused the assistant to make many unncessary
empty merge commits.
-- Joey Hess <email address hidden> Wed, 09 Jul 2014 15:28:03 -0400
