diff options
author | 2016-12-07 14:32:25 -0400 | |
---|---|---|
committer | 2016-12-07 14:32:25 -0400 | |
commit | 9350f8871f5498a34c99bed209799b9fbb6391d3 (patch) | |
tree | 369db25e472126dbea8feeb7ec70dbca404da66c /doc/git-annex-fromkey.mdwn | |
parent | 51b648ac6e11d0d5a9e617e45d236bd850894285 (diff) | |
parent | 3500fa70e016459fcd02cba4d4c3059e7f4555ef (diff) |
Merge branch 'master' into tor
Diffstat (limited to 'doc/git-annex-fromkey.mdwn')
-rw-r--r-- | doc/git-annex-fromkey.mdwn | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/git-annex-fromkey.mdwn b/doc/git-annex-fromkey.mdwn index 461f42eb6..2591e9785 100644 --- a/doc/git-annex-fromkey.mdwn +++ b/doc/git-annex-fromkey.mdwn @@ -4,14 +4,16 @@ git-annex fromkey - adds a file using a specific key # SYNOPSIS -git annex fromkey `[key file]` +git annex fromkey `[key file ...]` # DESCRIPTION This plumbing-level command can be used to manually set up a file in the git repository to link to a specified key. -If the key and file are not specified on the command line, they are +Multiple pairs of file and key can be given in a single command line. + +If no key and file pair are specified on the command line, they are instead read from stdin. Any number of lines can be provided in this mode, each containing a key and filename, separated by a single space. @@ -26,7 +28,7 @@ to do that. * `--force` Allow making a file link to a key whose content is not in the local - repository. The key may not be known to git-annex at all. + repository. The key may not be known to git-annex at all. # SEE ALSO |