aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex-preferred-content.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-18 16:04:25 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-18 16:04:35 -0400
commitea2180a6c141411f8ebdd041f065fae54ff2f780 (patch)
treeef19371742d05d8f2562ee49abc20db315983000 /doc/git-annex-preferred-content.mdwn
parent56e6d094aafd0df4b6e9f7abb83ff87b352aead5 (diff)
required: New command, like wanted, but for required content.
Also refactored some code to reduce duplication.
Diffstat (limited to 'doc/git-annex-preferred-content.mdwn')
-rw-r--r--doc/git-annex-preferred-content.mdwn7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/git-annex-preferred-content.mdwn b/doc/git-annex-preferred-content.mdwn
index 95dae8c14..49512f465 100644
--- a/doc/git-annex-preferred-content.mdwn
+++ b/doc/git-annex-preferred-content.mdwn
@@ -10,6 +10,13 @@ using `git annex vicfg` or `git annex wanted`.
They are used by the `--auto` option, by `git annex sync --content`,
and by the git-annex assistant.
+While preferred content expresses a preference, it can be overridden
+by simply using `git annex drop`. On the other hand, required content
+settings are enforced; `git annex drop` will refuse to drop a file if
+doing so would violate its required content settings. A repository's
+required content can be configured using `git annex vicfg` or
+`git annex required`.
+
Preferred content expressions are similar, but not identical to
the [[git-annex-matching-options]](1), just without the dashes.
For example: