diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-09 14:03:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-09 14:03:40 -0400 |
| commit | 2e1f3a86aec44337775b418b66bf9696146a49f2 (patch) | |
| tree | 6f80c1a75e06ffcaeefe4225fa45d18719a03667 | |
| parent | be310ac4d0d0c0343c8a7d54f9137ee1946bfd1c (diff) | |
| parent | cb552f4a443d9b89b6265c66b1e3ddda106ef4f8 (diff) | |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | doc/news/version_3.20120614.mdwn | 6 | ||||
| -rw-r--r-- | doc/news/version_3.20120807.mdwn | 7 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
4 files changed, 17 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 29dccb4c4..5fcd82626 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,19 @@ -git-annex (3.20120722) UNRELEASED; urgency=low +git-annex (3.20120808) UNRELEASED; urgency=low - * initremote: Avoid recording remote's description before checking - that its config is valid. * 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 + 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. - -- 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 diff --git a/doc/news/version_3.20120614.mdwn b/doc/news/version_3.20120614.mdwn deleted file mode 100644 index 33a06a0bf..000000000 --- a/doc/news/version_3.20120614.mdwn +++ /dev/null @@ -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"""]]
\ No newline at end of file diff --git a/doc/news/version_3.20120807.mdwn b/doc/news/version_3.20120807.mdwn new file mode 100644 index 000000000..cbec3cb75 --- /dev/null +++ b/doc/news/version_3.20120807.mdwn @@ -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."""]]
\ No newline at end of file diff --git a/git-annex.cabal b/git-annex.cabal index cdac47bc7..9defcb223 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120722 +Version: 3.20120807 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |