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

sync: Add support for --all and --unused.

Browse source
This commit is contained in:
Joey Hess 2015-06-16 16:50:03 -04:00
parent 58e6f033b9
commit 29c03145e6
6 changed files with 64 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

39
doc/git-annex-sync.mdwn
View file

@ -21,6 +21,9 @@ those branches on the remote repositories. You can use standard git
commands to do each of those steps by hand, or if you don't want to
worry about the details, you can use sync.
The content of annexed objects is not synced by default, but the --content
option (see below) can make that also be synchronized.
Merge conflicts are automatically handled by sync. When two conflicting
versions of a file have been committed, both will be added to the tree,
under different filenames. For example, file "foo" would be replaced
@ -31,9 +34,12 @@ tree with changes made to the local repository. However, those changes
are pushed to the remote, so they can be merged into its working tree
by running "git annex sync" on the remote.
# OPTIONS
* `--message=msg`
Use this option to specify a commit message.
* `--fast`
Only sync with the remotes with the lowest annex-cost value configured.
@ -41,20 +47,29 @@ by running "git annex sync" on the remote.
* `--content`
Normally, syncing does not transfer the contents of annexed files.
This option causes the file contents to also be uploaded and downloaded
as necessary.
This option causes the content of files in the work tree
to also be uploaded and downloaded as necessary.
By default, this tries to get each annexed file that 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).
By default, this tries to get each annexed file in the work tree
that the local repository does not yet have, and then copies each
file in the work tree 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).
To make two repositories have the same set of files, you should use
[[git-annex-mirror]](1) instead of this flag.
* `--all`
* `--message=msg`
This option, when combined with `--content`, makes all available versions
of all files be synced, when preferred content settings allow.
Use this option to specify a commit message.
Note that preferred content settings that use `include=` or `exclude=`
will only match the version of files currently in the work tree, but not
past versions of files.
* `--unused`
This option, when combined with `--content`, makes files
found by last run of git-annex unused be synced, when preferred content
settings allow.
# SEE ALSO
@ -62,8 +77,6 @@ by running "git annex sync" on the remote.
[[git-annex-preferred-content]](1)
[[git-annex-mirror]](1)
# AUTHOR
Joey Hess <id@joeyh.name>

2
doc/todo/wishlist:_--all_option_for_sync.mdwn
View file

@ -18,3 +18,5 @@ Please add an `--all` option to the `sync` command
Thanks
Andrew
> Implemented; [[done]]. --[[Joey]]