summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-03-31 19:05:47 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-03-31 19:05:47 -0400
commit7cd0ba73996b2ed092f8ee7cb62d0edf9f8f3f1b (patch)
tree6a23e810b4b3d8a3a4198a25190e0a8b3ce58c62 /debian
parent4dfa6059e42995eb050f58656fc32f9ee5d3ef16 (diff)
parentdc6d60cb3cbeed45e0651818f762445812f84e7a (diff)
Merge branch 'adjustedbranch'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f4542b7dd..53b894627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.