summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-06-09 20:14:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-06-09 20:16:01 -0400
commitf4308b107242781b5de98804eb68a9657b348c49 (patch)
treef6431c467f95eff81b92633b19b7595bb6b3928e /debian/changelog
parent2ca723a7c1c1130465b21d7db23c137976f58f6f (diff)
devblog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog6
1 files changed, 1 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 64225ea36..4d0b91950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,7 @@ git-annex (5.20140607) UNRELEASED; urgency=medium
* Ignore setsid failures.
* Avoid leaving behind .tmp files when failing in some cases, including
importing files to a disk that is full.
- * direct mode: Avoid committing a merge until after the work tree is
- updated. This avoids an interrupted merge leaving the work tree out
- of sync with the last commit, which could result in the wrong thing
- being committed later, and files appearing to get deleted.
- (They could be recovered by reverting the bad commit.)
+ * Avoid bad commits after interrupted direct mode sync (or merge).
-- Joey Hess <joeyh@debian.org> Mon, 09 Jun 2014 14:44:09 -0400