Merge branch 'adjustedbranch'

This commit is contained in:
Joey Hess 2016-03-31 19:05:47 -04:00
commit ed3e8e1886
Failed to extract signature
32 changed files with 1084 additions and 262 deletions

4
debian/changelog vendored
View file

@ -1,5 +1,9 @@
git-annex (6.20160319) UNRELEASED; urgency=medium
* adjust --unlock: Enters an adjusted branch in which all annexed files
are unlocked. The v6 equivilant of direct mode, but much cleaner!
* init --version=6: Automatically enter the adjusted unlocked branch
when filesystem doesn't support symlinks.
* ddar remote: fix ssh calls
Thanks, Robie Basak
* log: Display time with time zone.