aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-31 19:11:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-31 19:11:18 -0400
commitf48658d4eeaa76062f412d4fec9cdfcecd7b0e9d (patch)
treee898b3ca5d41a855bb509a1d8f8d1d3acfd2ebe9 /doc/git-annex.mdwn
parent700aed13cff27f9315df1209e0cd37d5e51f5390 (diff)
Now rsync is exclusively used for copying files to and from remotes. scp is not longer supported.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn10
1 files changed, 2 insertions, 8 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 8e6ff2c0c..e99be4e40 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -292,12 +292,6 @@ Here are all the supported configuration settings.
git-annex caches UUIDs of repositories 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 1000Kbit/s, set it to "-6 -l 1000"
-
* `remote.<name>.annex-ssh-options`
Options to use when using ssh to talk to this repository.
@@ -308,9 +302,9 @@ Here are all the supported configuration settings.
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`
+* `annex.ssh-options`, `annex.rsync-options`
- Default scp, ssh, and rsync options to use if a remote does not have
+ Default ssh and rsync options to use if a remote does not have
specific options.
* `annex.version`