summaryrefslogtreecommitdiff
path: root/doc/news/version_3.20111107.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/news/version_3.20111107.mdwn')
-rw-r--r--doc/news/version_3.20111107.mdwn8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/news/version_3.20111107.mdwn b/doc/news/version_3.20111107.mdwn
new file mode 100644
index 000000000..17431bf21
--- /dev/null
+++ b/doc/news/version_3.20111107.mdwn
@@ -0,0 +1,8 @@
+git-annex 3.20111107 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * merge: Use fast-forward merges when possible.
+ Thanks Valentin Haenel for a test case showing how non-fast-forward
+ merges could result in an ongoing pull/merge/push cycle.
+ * Don't try to read config from repos with annex-ignore set.
+ * Bugfix: In the past two releases, git-annex init has written the uuid.log
+ in the wrong format, with the UUID and description flipped."""]] \ No newline at end of file