mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some more v6 -> v7 doc changes

Browse source
This commit is contained in:
Joey Hess 2018-10-26 13:56:36 -04:00
parent 6fd37fb016
commit 7540ca6fca
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/git-annex-add.mdwn
View file

@ -24,7 +24,7 @@ modification of their content unless unlocked by [[git-annex-unlock]](1).
(This is not the case however when a repository is in a filesystem not (This is not the case however when a repository is in a filesystem not
supporting symlinks, or is in direct mode.) supporting symlinks, or is in direct mode.)
To add a file to the annex in unlocked form, `git add` can be used instead To add a file to the annex in unlocked form, `git add` can be used instead
(that only works when the repository has annex.version 6 or higher). (that only works in repository v7 or higher).
This command can also be used to add symbolic links, both symlinks to This command can also be used to add symbolic links, both symlinks to
annexed content, and other symlinks. annexed content, and other symlinks.

2
doc/git-annex-pre-commit.mdwn
View file

@ -17,7 +17,7 @@ point to annexed content.
When in a view, updates metadata to reflect changes When in a view, updates metadata to reflect changes
made to files in the view. made to files in the view.
When in a repository that has not been upgraded to annex.version 6, When in a repository that has not been upgraded to v7,
also handles injecting changes to unlocked files into the annex. also handles injecting changes to unlocked files into the annex.
# SEE ALSO # SEE ALSO

8
doc/git-annex-unlock.mdwn
View file

@ -14,10 +14,10 @@ symlink for each specified file with the file's content.
You can then modify it and `git annex add` (or `git commit`) to save your You can then modify it and `git annex add` (or `git commit`) to save your
changes. changes.
In repositories with annex.version 5 or earlier, unlocking a file is local In v5 repositories, unlocking a file is local
to the repository, and is temporary. With version 6, unlocking a file to the repository, and is temporary. In v7 repositories, unlocking a file
changes how it is stored in the git repository (from a symlink to a pointer changes how it is stored in the git repository (from a symlink to a pointer
file), so you can commit it like any other change. Also in version 6, you file), so you can commit it like any other change. Also in v7, you
can use `git add` to add a file to the annex in unlocked form. This allows can use `git add` to add a file to the annex in unlocked form. This allows
workflows where a file starts out unlocked, is modified as necessary, and workflows where a file starts out unlocked, is modified as necessary, and
is locked once it reaches its final version. is locked once it reaches its final version.
@ -26,7 +26,7 @@ Normally, unlocking a file requires a copy to be made of its content,
so that its original content is preserved, while the copy can be modified. so that its original content is preserved, while the copy can be modified.
To use less space, annex.thin can be set to true; this makes a hard link To use less space, annex.thin can be set to true; this makes a hard link
to the content be made instead of a copy. (Only when supported by the file to the content be made instead of a copy. (Only when supported by the file
system, and only in repository version 6.) While this can save considerable system, and only in v7 and higher.) While this can save considerable
disk space, any modification made to a file will cause the old version of the disk space, any modification made to a file will cause the old version of the
file to be lost from the local repository. So, enable annex.thin with care. file to be lost from the local repository. So, enable annex.thin with care.

2
doc/git-annex.mdwn
View file

@ -901,7 +901,7 @@ Here are all the supported configuration settings.
Set to true to make commands like `git-annex add` that add files to the Set to true to make commands like `git-annex add` that add files to the
repository add them in unlocked form. The default is to add files in repository add them in unlocked form. The default is to add files in
locked form. This only has effect in version 6 repositories. locked form. This only has effect in v7 repositories.
When a repository has core.symlinks set to false, it implicitly When a repository has core.symlinks set to false, it implicitly
sets annex.addunlocked to true. sets annex.addunlocked to true.

2
doc/install/comment_8_1330a5413b720eca0103a0880d24eb2d._comment
View file

@ -3,5 +3,5 @@
subject="""comment 8""" subject="""comment 8"""
date="2018-10-04T18:24:07Z" date="2018-10-04T18:24:07Z"
content=""" content="""
@seregynp, you need git-annex version 6 to use that. @seregynp, you need git-annex version 7 to use that.
"""]] """]]