summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-26 13:06:53 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-26 13:06:53 -0400
commitd9ff84c826f22ad6bae5c5df7ea071a91c90d5ea (patch)
treedf6e2874e409996badf1812c579310e717dc7db9
parent7ed1ce981efe3062d5823d1d69ed59d7f04a020f (diff)
reword
-rw-r--r--debian/changelog12
1 files changed, 5 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 6e62cd97d..5692ee14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,17 @@
git-annex (5.20151219) UNRELEASED; 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
+ * The upgrade to version 6 is not done fully automatically yet, 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.
+ * init, upgrade: Configure .git/info/attributes to use git-annex
+ as a smudge filter. In v6 repository mode, this makes git add
+ add files to the annex, unless overridden by annex.largefiles
+ configuration.
* 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.
* persistent-sqlite is now a hard build dependency, since v6 repository