From acb2d5a5a6878b43ba5fa52b6f4790c765f9f54d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 11 Dec 2011 21:55:51 -0400 Subject: releasing version 3.20111211 --- debian/changelog | 16 ++++++++-------- git-annex.cabal | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 405e98b74..b676c3c3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -git-annex (3.20111204) UNRELEASED; urgency=low +git-annex (3.20111211) unstable; urgency=medium + * Fix bug in last version in getting contents from bare repositories. + * Ensure that git-annex branch changes are merged into git-annex's index, + which fixes a bug that could cause changes that were pushed to the + git-annex branch to get reverted. As a side effect, it's now safe + for users to check out and commit changes directly to the git-annex + branch. * map: Fix a failure to detect a loop when both repositories are local and refer to each other with relative paths. * Prevent key names from containing newlines. @@ -12,14 +18,8 @@ git-annex (3.20111204) UNRELEASED; urgency=low * sync: New command that synchronises the local repository and default remote, by running git commit, pull, and push for you. * Version monad-control dependency in cabal file. - * Fix bug in last version in getting contents from bare repositories. - * Ensure that git-annex branch changes are merged into git-annex's index, - which fixes a bug that could cause changes that were pushed to the - git-annex branch to get reverted. As a side effect, it's now safe - for users to check out and commit changes directly to the git-annex - branch. - -- Joey Hess Sun, 04 Dec 2011 12:22:37 -0400 + -- Joey Hess Sun, 11 Dec 2011 21:24:39 -0400 git-annex (3.20111203) unstable; urgency=low diff --git a/git-annex.cabal b/git-annex.cabal index 8f5d6ebb8..35b3e690f 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20111203 +Version: 3.20111211 Cabal-Version: >= 1.6 License: GPL Maintainer: Joey Hess -- cgit v1.2.3