summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn15
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index c7d0f10da..14a787219 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1125,8 +1125,7 @@ Here are all the supported configuration settings.
* `remote.<name>.annex-cost-command`
If set, the command is run, and the number it outputs is used as the cost.
- This allows varying the cost based on e.g., the current network. The
- cost-command can be any shell command line.
+ This allows varying the cost based on e.g., the current network.
* `remote.<name>.annex-start-command`
@@ -1165,12 +1164,24 @@ Here are all the supported configuration settings.
This does not prevent git-annex sync (or the git-annex assistant) from
syncing the git repository to the remote.
+* `remote.<name>.annex-ignore-command`
+
+ If set, the command is run, and if it exits nonzero, that's the same
+ as setting annex-ignore to true. This allows controlling behavior based
+ on e.g., the current network.
+
* `remote.<name>.annex-sync`
If set to `false`, prevents git-annex sync (and the git-annex assistant)
from syncing with this remote by default. However, `git annex sync <name>`
can still be used to sync with the remote.
+* `remote.<name>.annex-sync-command`
+
+ If set, the command is run, and if it exits nonzero, that's the same
+ as setting annex-sync to false. This allows controlling behavior based
+ on e.g., the current network.
+
* `remote.<name>.annex-pull`
If set to `false`, prevents git-annex sync (and the git-annex assistant