summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-15 12:01:21 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-15 12:01:21 -0400
commit3842cb4c01eebb60e71a936fae1fa86ed8fe84d3 (patch)
treed09555d3420925c32e06770095b56d0c5ea0325f /doc
parentd0e5d276fa98ad6be7370556555c0f49a4838466 (diff)
parenta411c6635f143d4e0fc116d702ce25ce4907d8a5 (diff)
Merge branch 'master' into smudge
Diffstat (limited to 'doc')
-rw-r--r--doc/devblog/day_344-345__smudging_along.mdwn7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/devblog/day_344-345__smudging_along.mdwn b/doc/devblog/day_344-345__smudging_along.mdwn
new file mode 100644
index 000000000..7b7e6f042
--- /dev/null
+++ b/doc/devblog/day_344-345__smudging_along.mdwn
@@ -0,0 +1,7 @@
+New special remote alert! Chris Kastorff has made
+[a special remote supporting Backblaze's B2 storage servie](https://github.com/encryptio/git-annex-remote-b2).
+
+And I'm still working on v6 unlocked files. After beating on it for 2 more
+days, all git-annex commands should support them. There is still plenty
+of work to do on testing, upgrading, optimisation, merge conflict resolution,
+and reconciling staged changes.