summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-02 17:45:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-02 17:45:28 -0400
commitb9320ee1d53bfe72b0fbf7e08c927f5b45bbc5c9 (patch)
tree1e18e726c6dbfa6111a50f17fae6591156fd38d6 /doc
parentadad12d3374102790cab0cfbb9a5f0721ff88fc9 (diff)
use rsync for all remote file transfers
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 64ca6a549..63bc11eb7 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -258,11 +258,15 @@ Here are all the supported configuration settings.
here.
* `remote.<name>.annex-scp-options` -- Options to use when using scp
to or from this repository. For example, to force ipv6, and limit
- the bandwidth to 100Kbit/s, set it to "-6 -l 100"
+ the bandwidth to 1000Kbit/s, set it to "-6 -l 1000"
* `remote.<name>.annex-ssh-options` -- Options to use when using ssh
to talk to this repository.
-* `annex.scp-options` and `annex.ssh-options` -- Default scp and ssh
- options to use if a remote does not have specific options.
+* `remote.<name>.annex-rsync-options` -- Options to use when using rsync
+ to or from this repository. For example, to force ipv6, and limit
+ the bandwidth to 100Kbyte/s, set it to "-6 --bwlimit 100"
+* `annex.scp-options`, `annex.ssh-options`, `annex.rsync-options` --
+ Default scp, ssh, and rsync options to use if a remote does not have
+ specific options.
* `annex.version` -- Automatically maintained, and used to automate upgrades
between versions.