diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:22:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:22:07 -0400 |
| commit | b87fbc1e6c593c0aac0fd442ab7ad7f4e0f567c1 (patch) | |
| tree | 7b8acc3f84aa6539950ef57059912ceef4f14408 | |
| parent | d4e6ea845428a0605a18a7dfc506613539173836 (diff) | |
prep release
| -rw-r--r-- | debian/changelog | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 817c31612..f1a8a1773 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,16 @@ -git-annex (5.20140708) UNRELEASED; urgency=medium +git-annex (5.20140709) unstable; 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/ + * 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 <joeyh@debian.org> Tue, 08 Jul 2014 12:44:42 -0400 + -- Joey Hess <joeyh@debian.org> Wed, 09 Jul 2014 15:22:01 -0400 git-annex (5.20140707) unstable; urgency=medium |