diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-10 16:39:05 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-10 16:39:05 -0400 |
| commit | c2ea4b863b12608cca2a03f11d244c9228a7c885 (patch) | |
| tree | 31993fc6489f68d62efe3af1bd102bd563f47e60 | |
| parent | ee1bddd11663a3e1062d44bd9e0c3b58f1479f78 (diff) | |
prep release
| -rw-r--r-- | debian/changelog | 26 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index a357e3fe6..5a2a8efc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,15 @@ -git-annex (5.20150618) UNRELEASED; urgency=medium +git-annex (5.20150710) unstable; urgency=medium + * add: Stage symlinks the same as git add would, even if they are not a + link to annexed content. + * sync: When annex.autocommit=false, avoid making any commit of local + changes, while still merging with remote to the extent possible. + * unused: --used-refspec can now be configured to look at refs in the + reflog. This provides a way to not consider old versions of files to be + unused after they have reached a specified age, when the old refs in + the reflog expire. * log: Fix reversion introduced in version 5.20150528 that broke this command. - * assistant --autostart: First any daemons that are already running, + * assistant --autostart: First stop any daemons that are already running, which might be left over from a previous login session and so unable to use the ssh agent of a new login session. * assistant: Fix local pairing to not include newline in ssh pubkey, @@ -19,21 +27,13 @@ git-annex (5.20150618) UNRELEASED; urgency=medium * Support git's undocumented core.sharedRepository=2 value, which is equivilant to "world", and is set when a repo was created using git init --shared=world. - * On linux, pass --as-needed to linker to avoid linking with unused - shared libraries including libyaml. + * When building on linux, pass --as-needed to linker to avoid linking + with unused shared libraries including libyaml. * import: Fix failure of cross-device import on Windows. * merge: Avoid creating the synced/master branch. - * add: Stage symlinks the same as git add would, even if they are not a - link to annexed content. - * sync: When annex.autocommit=false, avoid making any commit of local - changes, while still merging with remote to the extent possible. - * unused: --used-refspec can now be configured to look at refs in the - reflog. This provides a way to not consider old versions of files to be - unused after they have reached a specified age, when the old refs in - the reflog expire. * Removed support for optparse-applicative versions older than 0.10. - -- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400 + -- Joey Hess <id@joeyh.name> Fri, 10 Jul 2015 16:36:42 -0400 git-annex (5.20150617) unstable; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index 941067f5d..d999e60d3 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20150617 +Version: 5.20150710 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <id@joeyh.name> |