summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-05 14:15:00 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-05 14:15:00 -0400
commit1ab7b2b8eaa1de567e20c36edf10affdd7f6ac8d (patch)
tree9fb5c8327e89c5c27548c68e105b0cd4d848f9b6
parent8511957c68942e92b7574b5598e8ad183c59a19b (diff)
add news item for git-annex 3.20120605
-rw-r--r--doc/news/version_3.20120406.mdwn4
-rw-r--r--doc/news/version_3.20120605.mdwn11
2 files changed, 11 insertions, 4 deletions
diff --git a/doc/news/version_3.20120406.mdwn b/doc/news/version_3.20120406.mdwn
deleted file mode 100644
index b3df304e2..000000000
--- a/doc/news/version_3.20120406.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-git-annex 3.20120406 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Disable diskfree on kfreebsd, as I have a build failure on kfreebsd-i386
- that is quite likely caused by it."""]] \ No newline at end of file
diff --git a/doc/news/version_3.20120605.mdwn b/doc/news/version_3.20120605.mdwn
new file mode 100644
index 000000000..ed0a09177
--- /dev/null
+++ b/doc/news/version_3.20120605.mdwn
@@ -0,0 +1,11 @@
+git-annex 3.20120605 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * sync: Show a nicer message if a user tries to sync to a special remote.
+ * lock: Reset unlocked file to index, rather than to branch head.
+ * import: New subcommand, pulls files from a directory outside the annex
+ and adds them.
+ * Fix display of warning message when encountering a file that uses an
+ unsupported backend.
+ * Require that the SHA256 backend can be used when building, since it's the
+ default.
+ * Preserve parent environment when running hooks of the hook special remote."""]] \ No newline at end of file