summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-05 15:05:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-05 15:06:44 -0400
commit0833eb43a6ab3cd74c8c9fc77d235fd5644ac555 (patch)
treefec0d96e440d23960e13232030a55957379a0662 /debian
parentfd61354431c0ee59e8adf6d026e14f0c718bd33b (diff)
parentb885c0c6c8faa0c56e5f8cbdaa031652df6b26b4 (diff)
Merge remote-tracking branch 'origin/master' into assistant
Conflicts: Init.hs
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 081d1ac9f..3751cf790 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ git-annex (3.20120722) UNRELEASED; urgency=low
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.
-- Joey Hess <joeyh@debian.org> Fri, 27 Jul 2012 21:04:47 -0400