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 a4d6599ba..150307c22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ git-annex (4.20130816) UNRELEASED; urgency=low
* Debian: Run the builtin test suite as an autopkgtest.
* Debian: Recommend ssh-askpass, which ssh will use when the assistant
is run w/o a tty. Closes: #719832
+ * sync, merge: Bug fix: Don't try to merge into master when in a bare repo.
-- Joey Hess <joeyh@debian.org> Thu, 15 Aug 2013 15:47:52 +0200