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 /debian | |
| parent | be310ac4d0d0c0343c8a7d54f9137ee1946bfd1c (diff) | |
| parent | cb552f4a443d9b89b6265c66b1e3ddda106ef4f8 (diff) | |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 13 |
1 files changed, 9 insertions, 4 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 |