Merge branch 'master' into import-from-s3
This commit is contained in:
commit
700a3f2787
29 changed files with 426 additions and 43 deletions
|
@ -63,7 +63,7 @@ The following terms can be used in annex.largefiles:
|
|||
|
||||
Looks up the MIME type of a file, and checks if the glob matches it.
|
||||
|
||||
For example, "mimetype=text/*" will match many varieties of text files,
|
||||
For example, `"mimetype=text/*"` will match many varieties of text files,
|
||||
including "text/plain", but also "text/x-shellscript", "text/x-makefile",
|
||||
etc.
|
||||
|
||||
|
@ -72,6 +72,18 @@ The following terms can be used in annex.largefiles:
|
|||
This is only available to use when git-annex was built with the
|
||||
MagicMime build flag.
|
||||
|
||||
* `mimeencoding=glob`
|
||||
|
||||
Looks up the MIME encoding of a file, and checks if the glob matches it.
|
||||
|
||||
For example, `"mimeencoding=binary"` will match many kinds of binary
|
||||
files.
|
||||
|
||||
The MIME encodings are the same that are displayed by running `file --mime-encoding`
|
||||
|
||||
This is only available to use when git-annex was built with the
|
||||
MagicMime build flag.
|
||||
|
||||
* `anything`
|
||||
|
||||
Matches any file.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue