summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dd9b2cba7..6188fc0de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,8 @@ git-annex (6.20160924) UNRELEASED; urgency=medium
* When auto-upgrading a v3 remote, avoid upgrading to version 6,
instead keep it at version 5.
* Support using v3 repositories without upgrading them to v5.
+ * sync: Fix bug in adjusted branch merging that could cause recently
+ added files to be lost when updating the adjusted branch.
-- Joey Hess <id@joeyh.name> Mon, 26 Sep 2016 16:46:19 -0400