diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-24 19:23:18 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-24 19:23:18 -0400 |
| commit | 819389465d4caedd10e905f0945c60e3fc67c8ea (patch) | |
| tree | 7c722fbf22d2461fd38fe1986d157de322c17922 /debian/changelog | |
| parent | 378417c70338418ce2fd42643cad5b2f31d7ed8e (diff) | |
| parent | a9b36eb958b2dec1cefefe92262965b0f7dceb27 (diff) | |
Merge branch 'smudge'
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 73035a683..1ce79936e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +git-annex (6.20151225) unstable; urgency=medium + + * Added v6 repository mode, but v5 is still the default for now. + * The upgrade to version 6 is not done fully automatically, because + upgrading a direct mode repository to version 6 will prevent old + versions of git-annex from working in other clones of that repository. + * init: --version parameter added to control which supported repository + version to use. + * smudge: New command, used for git smudge filter. + This will replace direct mode. + * init, upgrade: Configure .git/info/attributes to use git-annex as a smudge + filter. Note that this changes the default behavior of git add in a + newly initialized repository; it will add files to the annex. + * unlock, lock: In v6 mode, unlocking a file changes it from a symlink to a + pointer file, and this change can be committed to the git repository. + * add: In v6 mode, adds modified files to the annex. + * assistant: In v6 mode, adds files in unlocked mode, so they can + continue to be modified. + + -- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400 + git-annex (5.20151219) UNRELEASED; urgency=medium * status: On crippled filesystems, was displaying M for all annexed files |