summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-27 15:02:38 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-27 15:02:44 -0400
commit5096cb295c9068ab02aa3aa1bf8eb70b2ed89ede (patch)
treeda116313c5e510e36a17001116655e95f945ea7a /doc
parent9cce9dd3735b98c92400e10e08c2723e5bf7f118 (diff)
securehash matching
Added --securehash option to match files using a secure hash function, and corresponding securehash preferred content expression. This commit was sponsored by Ethan Aubin.
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex-matching-options.mdwn5
-rw-r--r--doc/git-annex-preferred-content.mdwn5
-rw-r--r--doc/preferred_content.mdwn1
3 files changed, 11 insertions, 0 deletions
diff --git a/doc/git-annex-matching-options.mdwn b/doc/git-annex-matching-options.mdwn
index 5c5f6ca25..2802fe60b 100644
--- a/doc/git-annex-matching-options.mdwn
+++ b/doc/git-annex-matching-options.mdwn
@@ -95,6 +95,11 @@ in either of two repositories.
Matches only files whose content is stored using the specified key-value
backend.
+* `--securehash`
+
+ Matches only files whose content is hashed using a cryptographically
+ secure function.
+
* `--inallgroup=groupname`
Matches only files that git-annex believes are present in all repositories
diff --git a/doc/git-annex-preferred-content.mdwn b/doc/git-annex-preferred-content.mdwn
index a8d2efeb2..92899c82a 100644
--- a/doc/git-annex-preferred-content.mdwn
+++ b/doc/git-annex-preferred-content.mdwn
@@ -96,6 +96,11 @@ elsewhere to allow removing it).
Matches only files whose content is stored using the specified key-value
backend.
+* `securehash`
+
+ Matches only files whose content is hashed using a cryptographically
+ secure function.
+
* `inallgroup=groupname`
Matches only files that git-annex believes are present in all repositories
diff --git a/doc/preferred_content.mdwn b/doc/preferred_content.mdwn
index d7b9870e5..19670723c 100644
--- a/doc/preferred_content.mdwn
+++ b/doc/preferred_content.mdwn
@@ -58,6 +58,7 @@ it assumes all files that are currently present are preferred content.
Here are recent changes to preferred content expressions, and the version
they were added in.
+* "securehash" 6.20170228
* "nothing" 6.201600202
* "anything" 5.20150616
* "standard" 5.20140314