summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e8264a4a9..45619ea2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ git-annex (5.20150618) UNRELEASED; urgency=medium
* On linux, pass --as-needed to linker to avoid linking with unused
shared libraries including libyaml.
* import: Fix failure of cross-device import on Windows.
+ * merge: Avoid creating the synced/master branch.
-- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400