summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-12 15:57:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-12 15:57:09 -0400
commit1cabf96c4b5f45bff9b318115cec109955a618f3 (patch)
tree942ed217d0895b301a871ef69987e03ff4e322b2 /debian
parent353bc9e7000b5ee78f69194151475f6eefc82bc0 (diff)
Fix direct mode's handling when modifications to non-annexed files are pulled from a remote. A bug prevented the files from being updated in the work tree, and this caused the modification to be reverted.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9eb68ce77..8af731481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ git-annex (5.20131131) UNRELEASED; urgency=low
* repair: Improve repair of git-annex index file.
* repair: Remove damaged git-annex sync branches.
* status: Ignore new files that are gitignored.
+ * Fix direct mode's handling when modifications to non-annexed files
+ are pulled from a remote. A bug prevented the files from being updated
+ in the work tree, and this caused the modification to be reverted.
-- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400