diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-21 23:41:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-22 17:32:47 -0400 |
| commit | 4eb51126819fe01a003688267f481c6d8014ef47 (patch) | |
| tree | 40f88312d53da654b65a7ed25617e5bdbd6be03c /doc | |
| parent | 52b90e5d4c2a22415d48a8e572eab328dfcc4407 (diff) | |
rationalize getConfig
getConfig got a remote-specific config, and this confusing name caused it
to be used a couple of places that only were interested in global configs.
Rename to getRemoteConfig and make getConfig only get global configs.
There are no behavior changes here, but remote.<name>.annex-web-options
never actually worked (and per-remote web options is a very unlikely to be
useful case so I didn't make it work), so fix the documentation for it.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-annex.mdwn | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index dd94ccc0c..72301c071 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -696,26 +696,26 @@ 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-web-options` - - Options to use when using wget or curl to download a file from the web. - (wget is always used in preference to curl if available). - For example, to force ipv4 only, set it to "-4" - * `remote.<name>.annex-bup-split-options` Options to pass to bup split when storing content in this remote. For example, to limit the bandwidth to 100Kbye/s, set it to "--bwlimit 100k" (There is no corresponding option for bup join.) -* `annex.ssh-options`, `annex.rsync-options`, `annex.web-options, `annex.bup-split-options` +* `annex.ssh-options`, `annex.rsync-options`, `annex.bup-split-options` Default ssh, rsync, wget/curl, and bup options to use if a remote does not have specific options. +* `annex.web-options` + + Options to use when using wget or curl to download a file from the web. + (wget is always used in preference to curl if available). + For example, to force ipv4 only, set it to "-4" + * `remote.<name>.rsyncurl` - Used by rsunc special remotes, this configures + Used by rsync special remotes, this configures the location of the rsync repository to use. Normally this is automaticaly set up by `git annex initremote`, but you can change it if needed. |