diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-01-02 14:22:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-01-02 14:22:50 -0400 |
| commit | f0c4a1c770b7baf6e122bd990fcdd33b90eb2d53 (patch) | |
| tree | c053803e3f4e6e02e414725bee35072b02f01051 | |
| parent | ae99b64b538f13e2100429afd8b4de7960db8cff (diff) | |
annex.web-options also works
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 80a39964d..33cced98e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ git-annex (3.20111232) UNRELEASED; urgency=low - * Added remote.name.annex-web-options configuration setting, which can be + * Added annex-web-options configuration settings, which can be used to provide parameters to whichever of wget or curl git-annex uses (depends on which is available, but most of their important options suitable for use here are the same). diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 896ccc311..f94a3d808 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -615,10 +615,10 @@ Here are all the supported configuration settings. 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.bup-split-options` +* `annex.ssh-options`, `annex.rsync-options`, `annex.web-options, `annex.bup-split-options` - Default ssh, rsync, and bup options to use if a remote does not have - specific options. + Default ssh, rsync, wget/curl, and bup options to use if a remote does not + have specific options. * `remote.<name>.buprepo` |