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)
This commit is contained in:
parent
04b77328ef
commit
1192d98721
6 changed files with 91 additions and 39 deletions
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue