diff options
author | Joey Hess <joey@kitenet.net> | 2012-06-05 20:30:37 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-06-05 20:30:37 -0400 |
commit | a7a729bce4db901a1142b5ef7ab8cab0d1311a66 (patch) | |
tree | 87ac0ab8e35e7485dc58828b8d82ad2a383ff036 /debian | |
parent | e6b157cc099f6d0a5ea26da823bfb6ab8ea4dbc7 (diff) | |
parent | c981ccc0773a02ca60eb6456f04de14cd758ee7b (diff) |
Merge branch 'master' into watch
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index fd4f7b98b..9a010327d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-annex (3.20120606) UNRELEASED; urgency=low + + * add: Prevent (most) modifications from being made to a file while it + is being added to the annex. + + -- Joey Hess <joeyh@debian.org> Tue, 05 Jun 2012 20:25:51 -0400 + git-annex (3.20120605) unstable; urgency=low * sync: Show a nicer message if a user tries to sync to a special remote. |