summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-11-01 00:17:26 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-11-01 00:17:26 -0400
commite638f9647d10ca0cc63799698456a387ca9b8382 (patch)
tree06a9477d22ddc1726a1ca408832269c2c3be70c6 /doc
parent99c522edeff6add3ece41922f862c59b5afdddbe (diff)
add global fallback for per-repo options
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index d176a04c0..fa584d360 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -178,7 +178,8 @@ Many git-annex subcommands will stage changes for later `git commit` by you.
# CONFIGURATION
-Like other git commands, git-annex is configured via `.git/config`.
+Like other git commands, git-annex is configured via `git-config`.
+Here are all the supported configuration settings.
* `annex.uuid` -- a unique UUID for this repository (automatically set)
* `annex.numcopies` -- number of copies of files to keep across all
@@ -201,6 +202,8 @@ Like other git commands, git-annex is configured via `.git/config`.
the bandwidth to 100Kbit/s, set it to "-6 -l 100"
* `remote.<name>.annex-ssh-options` -- Options to use when using ssh
to talk to this repository.
+* `annex.scp-options` and `annex.ssh-options` -- Default scp and ssh
+ options to use if a remote does not have specific options.
# FILES