diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-03 14:57:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-03 14:57:16 -0400 |
| commit | a9067868a8594577ead2ecbe55f9563bef12f26d (patch) | |
| tree | 1694cea1754589a7cf0d8ed3096e03d9d430b99d /debian/changelog | |
| parent | 8d6edac6f48a4bf1522b68a30db579193c097e7a (diff) | |
sync: Fix bug in direct mode that caused a file not checked into git to be deleted when merging with a remote that added a file by the same name. (Thanks, jkt)
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 907a3d1db..0807c1c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ git-annex (5.20140228) UNRELEASED; urgency=medium + * sync: Fix bug in direct mode that caused a file not checked into git + to be deleted when merging with a remote that added a file by the same + name. * webapp: Now supports HTTPS. * webapp: No longer supports a port specified after --listen, since it was buggy, and that use case is better supported by setting up HTTPS. |