summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-03-15 14:07:43 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-03-15 14:07:43 -0400
commit96af58d9e0f73ad78f09651e855b20cc27f9113a (patch)
tree2a939a600e11870caf511cf592819282f0d25c63 /doc/git-annex.mdwn
parent5f7979ffe85e036451bb869e29ca161ad3aa0272 (diff)
fromkey: Add stdin mode.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 254e0883b..3af9bbb8c 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -952,7 +952,7 @@ subdirectories).
git annex examinekey --format='.git/annex/objects/${hashdirmixed}${key}/${key}'
-* `fromkey key file`
+* `fromkey [key file]`
This plumbing-level command can be used to manually set up a file
in the git repository to link to a specified key.
@@ -960,6 +960,10 @@ subdirectories).
Normally, the annex needs to already contain the content object for the
key. To override this, use --force.
+ If the key and file are not 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, sepearated by whitespace.
+
* `dropkey [key ...]`
This plumbing-level command drops the annexed data for the specified