diff --git a/CHANGELOG b/CHANGELOG index c0b8a07561..0b470d9c1b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -474,7 +474,7 @@ git-annex (7.20200204) upstream; urgency=medium git-annex (7.20200202.7) upstream; urgency=medium - * add: --force-annex/--force-git options make it easier to override + * add: --force-large/--force-small options make it easier to override annex.largefiles configuration (and potentially safer as it avoids bugs like the smudge bug fixed in the last release). * reinject --known: Fix bug that prevented it from working in a bare repo. diff --git a/doc/tips/largefiles.mdwn b/doc/tips/largefiles.mdwn index 7764325af7..5a5906bfbf 100644 --- a/doc/tips/largefiles.mdwn +++ b/doc/tips/largefiles.mdwn @@ -104,6 +104,8 @@ This first removes the file from git's index cache, and then adds it back using git-annex. You can modify the file before the `git-annex add` step, perhaps replacing it with new larger content that necessitates git-annex. +The --force-large option needs git-annex version 7.20200202.7 or newer. + ## converting annexed to git When you have a file that is currently stored in the annex, and you want to @@ -117,3 +119,5 @@ convert that to be stored in git, here's how to accomplish that: You can modify the file after unlocking it and before adding it to git. And this is probably a good idea if it was really a big file, so that you can replace its content with something smaller. + +The --force-small option needs git-annex version 7.20200202.7 or newer.