summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-31 15:07:45 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-31 15:07:45 -0400
commit9b12701b9ec28f342d8bc25fa51d941b8cf02320 (patch)
tree99df182870f70f6c6981aca53d5dbff0361ac9cf
parentf165e4aa997ecb34e2f225d405781a1789806d75 (diff)
releasing version 3.201112313.20111231
-rw-r--r--debian/changelog14
-rw-r--r--git-annex.cabal2
2 files changed, 9 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index db447fea4..2732e87a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
-git-annex (3.20111212) UNRELEASED; urgency=low
+git-annex (3.20111231) unstable; urgency=low
+ * sync: Improved to work well without a central bare repository.
+ Thanks to Joachim Breitner.
+ * Rather than manually committing, pushing, pulling, merging, and git annex
+ merging, we encourage you to give "git annex sync" a try.
+ * sync --fast: Selects some of the remotes with the lowest annex.cost
+ and syncs those, in addition to any specified at the command line.
* Union merge now finds the least expensive way to represent the merge.
* reinject: Add a sanity check for using an annexed file as the source file.
* Properly handle multiline git config values.
@@ -16,12 +22,8 @@ git-annex (3.20111212) UNRELEASED; urgency=low
* Can now be built with older git versions (before 1.7.7); the resulting
binary should only be used with old git.
* Updated to build with monad-control 0.3.
- * sync: Improved to work well without a central bare repository.
- Thanks to Joachim Breitner.
- * sync --fast: Selects some of the remotes with the lowest annex.cost
- and syncs those, in addition to any specified at the command line.
- -- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 31 Dec 2011 14:55:29 -0400
git-annex (3.20111211) unstable; urgency=medium
diff --git a/git-annex.cabal b/git-annex.cabal
index a0980b1f0..902acd0de 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 3.20111212
+Version: 3.20111231
Cabal-Version: >= 1.6
License: GPL
Maintainer: Joey Hess <joey@kitenet.net>