document version for --force-large/--force-small

also fix the wrong name in the changelog
This commit is contained in:
Joey Hess 2020-10-26 11:34:30 -04:00
parent 5907415380
commit 8fda1ef0fa
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 1 deletions

View file

@ -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.

View file

@ -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.