summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-22 14:57:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-22 14:57:09 -0400
commit8655ea7f8e853b7de4defbca2655b741362ecd21 (patch)
tree685b461a9e6471dbf403bb281d4382661a36d245 /doc
parent032c802d45c7872f704de1faf0733740b256444d (diff)
sync, assistant: Sync with remotes that have annex-ignore set
This is so git remotes on servers without git-annex installed can be used to keep clients' git repos in sync. This is a behavior change, but since annex-sync can be set to disable syncing with a remote, I think it's acceptable.
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index b9badce9b..1c2247654 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -904,14 +904,17 @@ Here are all the supported configuration settings.
* `remote.<name>.annex-ignore`
If set to `true`, prevents git-annex
- from using this remote by default. (You can still request it be used
- by the --from and --to options.)
+ from storing file contents on this remote by default.
+ (You can still request it be used by the --from and --to options.)
This is, for example, useful if the remote is located somewhere
without git-annex-shell. (For example, if it's on GitHub).
Or, it could be used if the network connection between two
repositories is too slow to be used normally.
+ This does not prevent git-annex sync (or the git-annex assistant) from
+ syncing the git repository to the remote.
+
* `remote.<name>.annex-sync`
If set to `false`, prevents git-annex sync (and the git-annex assistant)