summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-07 18:10:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-07 18:10:31 -0400
commitfaa4935047b7083e1970d13f51fbaa6fe7d0fe3d (patch)
treebe7cbf99cc7ffe601602a669219156ba199081a3 /debian
parent26d3c3b4977405127b52da0cddefe845b855f08f (diff)
Handle a case where an annexed file is moved into a gitignored directory, by having fix --force add its change.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0b4fe3486..265a010c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (3.20111108) UNRELEASED; urgency=low
+
+ * Handle a case where an annexed file is moved into a gitignored directory,
+ by having fix --force add its change.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 07 Nov 2011 18:08:42 -0400
+
git-annex (3.20111107) unstable; urgency=low
* merge: Use fast-forward merges when possible.