diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 10 | ||||
| -rw-r--r-- | doc/walkthrough.mdwn | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 76e16af2c..5b3f2ebfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (0.15) UNRELEASED; urgency=low that are trusted to retain files without explicit checking. * Fix bug in numcopies handling when multiple remotes pointed to the same repository. + * Now rsync is exclusively used for copying files to and from remotes. + scp is not longer supported. -- Joey Hess <joeyh@debian.org> Tue, 28 Dec 2010 13:13:20 -0400 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` diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn index b486a4b1f..c2ae583f0 100644 --- a/doc/walkthrough.mdwn +++ b/doc/walkthrough.mdwn @@ -198,7 +198,7 @@ to clone the laptop's annex to it: # cd ~/annex # git annex init "my desktop" -Now you can get files and they will be transferred (using `rsync` or `scp`): +Now you can get files and they will be transferred (using `rsync`): # git annex get my_cool_big_file get my_cool_big_file (getting UUID for origin...) (copying from origin...) |