2014-07-09 20:08:50 +00:00
|
|
|
git-annex 5.20140709 released with [[!toggle text="these changes"]]
|
|
|
|
|
[[!toggleable text="""
|
|
|
|
|
* 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
|
2014-07-09 20:16:32 +00:00
|
|
|
empty merge commits."""]]
|
