diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-17 15:11:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-17 15:11:21 -0400 |
| commit | 6668fe0ca201fb28311ca10300afc06136d38211 (patch) | |
| tree | 76b01abe2e4227f0c2ad29f71b665cfe0194c1e6 /debian | |
| parent | bf1d81bd3ec7b4128d13ca04d2a90c8165d5ee2f (diff) | |
update for DiffTree type change (which fixes assistant in subdir confusion bug)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 1a7b5f1ab..e124c71d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ git-annex (4.20131003) UNRELEASED; urgency=low * sync: Fix automatic resolution of merge conflicts where one side is an annexed file, and the other side is a non-annexed file, or a directory. * S3: Try to ensure bucket name is valid for archive.org. + * assistant: Bug fix: When run in a subdirectory, files from incoming merges + were wrongly added to that subdirectory, and removed from their original + locations. -- Joey Hess <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400 |