mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into assistant

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2012-08-09 14:03:40 -04:00
commit 2e1f3a86ae
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
debian/changelog vendored
View file

@ -1,14 +1,19 @@
git-annex (3.20120722) UNRELEASED; urgency=low git-annex (3.20120808) UNRELEASED; urgency=low
* init: If no description is provided for a new repository, one will
automatically be generated, like "joey@gnu:~/foo"
-- Joey Hess <joeyh@debian.org> Tue, 07 Aug 2012 13:35:07 -0400
git-annex (3.20120807) unstable; urgency=low
* initremote: Avoid recording remote's description before checking * initremote: Avoid recording remote's description before checking
that its config is valid. that its config is valid.
* init: If no description is provided for a new repository, one will
automatically be generated, like "joey@gnu:~/foo"
* unused, status: Avoid crashing when ran in bare repo. * unused, status: Avoid crashing when ran in bare repo.
* Avoid crashing when "git annex get" fails to download from one * Avoid crashing when "git annex get" fails to download from one
location, and falls back to downloading from a second location. location, and falls back to downloading from a second location.
-- Joey Hess <joeyh@debian.org> Fri, 27 Jul 2012 21:04:47 -0400 -- Joey Hess <joeyh@debian.org> Tue, 07 Aug 2012 13:35:07 -0400
git-annex (3.20120721) unstable; urgency=low git-annex (3.20120721) unstable; urgency=low

6
doc/news/version_3.20120614.mdwn
View file

@ -1,6 +0,0 @@
git-annex 3.20120614 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* addurl: Was broken by a typo introduced 2 released ago, now fixed.
Closes: #[677576](http://bugs.debian.org/677576)
* Install man page when run by cabal, in a location where man will
find it, even when installing under $HOME. Thanks, Nathan Collins"""]]

7
doc/news/version_3.20120807.mdwn Normal file
View file

@ -0,0 +1,7 @@
git-annex 3.20120807 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* initremote: Avoid recording remote's description before checking
that its config is valid.
* unused, status: Avoid crashing when ran in bare repo.
* Avoid crashing when "git annex get" fails to download from one
location, and falls back to downloading from a second location."""]]

2
git-annex.cabal
View file

@ -1,5 +1,5 @@
Name: git-annex Name: git-annex
Version: 3.20120722 Version: 3.20120807
Cabal-Version: >= 1.8 Cabal-Version: >= 1.8
License: GPL License: GPL
Maintainer: Joey Hess <joey@kitenet.net> Maintainer: Joey Hess <joey@kitenet.net>