summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-09 23:31:44 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-09 23:31:44 -0400
commit0d5c4022105a393a4eac76b09940f8b22fa0a56c (patch)
treea86e5d64d4b9fc95b0316c5fb08b9eef925bd1b7 /doc
parent9ffd97442b3f2e4e9de6895d843aee382ad10dfd (diff)
Add annex-trustlevel configuration settings, which can be used to override the trust level of a remote.
This overrides the trust.log, and is overridden by the command-line trust parameters. It would have been nicer to have Logs.Trust.trustMap just look up the configuration for all remotes, but a dependency loop prevented that (Remotes depends on Logs.Trust in several ways). So instead, look up the configuration when building remotes, storing it in the same forcetrust field used for the command-line trust parameters.
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 629e191b5..59b756de8 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -606,6 +606,12 @@ Here are all the supported configuration settings.
git-annex caches UUIDs of remote repositories here.
+* `remote.<name>.annex-trustlevel`
+
+ Configures a local trust level for the remote. This overrides the value
+ configured by the trust and untrust commands. The value can be any of
+ "trusted", "semitrusted" or "untrusted".
+
* `remote.<name>.annex-ssh-options`
Options to use when using ssh to talk to this remote.