diff options
author | 2014-02-02 16:06:34 -0400 | |
---|---|---|
committer | 2014-02-02 16:06:34 -0400 | |
commit | a8fb1b684ef93c02b0741e18998e6b20d1d880f1 (patch) | |
tree | 057a31fd2f530b3a7e994f7c822721f42948adfb /doc | |
parent | 04f31f98ee20f67214d579374b2e5a0f0a1659ec (diff) |
Added ways to configure rsync options to be used only when uploading or downloading from a remote. Useful to eg limit upload bandwidth.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/git-annex.mdwn | 24 | ||||
-rw-r--r-- | doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn | 2 |
2 files changed, 22 insertions, 4 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index fa1175fb6..ef935921b 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -1379,6 +1379,21 @@ Here are all the supported configuration settings. to or from this remote. For example, to force ipv6, and limit the bandwidth to 100Kbyte/s, set it to `-6 --bwlimit 100` +* `remote.<name>.annex-rsync-upload-options` + + Options to use when using rsync to upload a file to a remote. + + These options are passed after other applicable rsync options, + so can be used to override them. For example, to limit upload bandwidth + to 10Kbye/s, set `--bwlimit 10`. + +* `remote.<name>.annex-rsync-download-options` + + Options to use when using rsync to download a file from a remote. + + These options are passed after other applicable rsync options, + so can be used to override them. + * `remote.<name>.annex-rsync-transport` The remote shell to use to connect to the rsync remote. Possible @@ -1402,11 +1417,12 @@ Here are all the supported configuration settings. precedence over the default GnuPG configuration, which is otherwise used.) -* `annex.ssh-options`, `annex.rsync-options`, `annex.bup-split-options`, - `annex.gnupg-options` +* `annex.ssh-options`, `annex.rsync-options`, + `annex.rsync-upload-options`, `annex.rsync-download-options`, + `annex.bup-split-options`, `annex.gnupg-options` - Default ssh, rsync, wget/curl, bup, and GnuPG options to use if a - remote does not have specific options. + Default options to use if a remote does not have more specific options + as described above. * `annex.web-options` diff --git a/doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn b/doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn index 65a3a12ef..2b93ad2d6 100644 --- a/doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn +++ b/doc/todo/separate_rsync_bwlimit_options_for_upload_and_download.mdwn @@ -1,2 +1,4 @@ The bandwidth for upload and download are often different. It would be useful to have different settings for upload and download limits. As it is, I have to keep changing annex-rsync-options options between uploads and downloads. + +> [[done]] --[[Joey]] |