summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/design/assistant/transfer_control.mdwn10
-rw-r--r--doc/git-annex.mdwn9
2 files changed, 12 insertions, 7 deletions
diff --git a/doc/design/assistant/transfer_control.mdwn b/doc/design/assistant/transfer_control.mdwn
index 204f5d090..e38b0ca97 100644
--- a/doc/design/assistant/transfer_control.mdwn
+++ b/doc/design/assistant/transfer_control.mdwn
@@ -8,9 +8,9 @@ But often the remote is just a removable drive or a cloud remote,
that has a limited size. This page is about making the assistant do
something smart with such remotes.
-## specifying what data belongs on a remote
+## specifying what data a remote prefers to contain **done**
-Imagine a per-remote `annex-accept` setting, that matches things that
+Imagine a per-remote preferred content setting, that matches things that
should be stored on the remote.
For example, a MP3 player might use:
@@ -23,14 +23,10 @@ A USB drive that is carried between three laptops and used to sync data
between them might use: `not (in=laptop1 and in=laptop2 and in=laptop3)`
In this case, transferring data from the usb repo should
-check if `annex-accept` then rejects the data, and if so, drop it
+check if preferred content settings rejects the data, and if so, drop it
from the repo. So once all three laptops have the data, it is
pruned from the transfer drive.
-It may make sense to have annex-accept info also be stored in the git-annex
-branch, for settings that should apply to a repo globally. Does it make
-sense to have local configuration too?
-
## repo groups
Seems like git-annex needs a way to know the groups of repos. Some
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 5c762593e..390d19eaf 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -643,6 +643,15 @@ file contents are present at either of two repositories.
Matches only files whose content is stored using the specified key-value
backend.
+* --smallerthan=size
+* --largerthan=size
+
+ Matches only files whose content is smaller than, or larger than the
+ specified size.
+
+ The size can be specified with any commonly used units, for example,
+ "0.5 gb" or "100 KiloBytes"
+
* --not
Inverts the next file matching option. For example, to only act on