diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 612864faf..64225ea36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ 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.) -- Joey Hess <joeyh@debian.org> Mon, 09 Jun 2014 14:44:09 -0400 |