improve man page wording

This commit is contained in:
Joey Hess 2021-04-01 12:58:06 -04:00
parent 5c227b414e
commit 370e71aa73
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 27 additions and 5 deletions

View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2021-04-01T16:36:11Z"
content="""
It would be impossible to sync with a remote that is not enabled,
so I don't know if that is a useful distinction to draw.
Also, if a file is not present in any remotes yet either, syncing will
not get it, and not fail, and leave the local repo without the file's
content. And this is not happening because a remote is not enabled,
but because there is no path to get the data from the repo that contains
it.
I did change the man page to say "The --content option causes the content of annexed files
to also be uploaded and downloaded as necessary, to sync the content between the repository and its remotes."
Which may be explcit enough to remove the ambiguity that surprised you,
but I'm not sure if I've hit on the right wording.
"""]]

View file

@ -108,16 +108,18 @@ have the same value as the currently checked out branch.
Normally, syncing does not transfer the contents of annexed files.
The --content option causes the content of annexed files
to also be uploaded and downloaded as necessary.
to also be uploaded and downloaded as necessary, to sync the content
between the repository and its remotes.
The `annex.synccontent` configuration can be set to true to make content
be synced by default.
Normally this tries to get each annexed file that is in the working tree
and whose content the local repository does not yet have, and then copies
each file to every remote that it is syncing with.
This behavior can be overridden by configuring the preferred content
of a repository. See [[git-annex-preferred-content]](1).
and whose content the local repository does not yet have, from any remote
that it's syncing with that has a copy, and then copies each file to
every remote that it is syncing with. This behavior can be overridden by
configuring the preferred content of repositories. See
[[git-annex-preferred-content]](1).
* `--content-of=path` `-C path`