summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-31 12:33:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-31 12:33:41 -0400
commitcc1ea8f84463c7e333bfa17a815f250d8d088841 (patch)
treeaa4868f5b59edf4cbb3b34d5ae16f19d06804efa /doc
parente09dd6f306b3f69718c77a03364ee9e51a51bb3b (diff)
Removed the setkey command, and added a setcontent command with a more useful interface.
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn23
1 files changed, 14 insertions, 9 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index dc0b49ab2..abddaa0de 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -274,6 +274,20 @@ subdirectories).
However, if a backend changes the information it uses to construct a key,
this can also be used to migrate files to use the new key format.
+* setcontent src dest
+
+ Makes the dest file, which must already be tracked by git-annex have the
+ content of the src file. The src file is removed. This can be useful if you
+ have obtained the content of a file from elsewhere and want to put it in
+ the local annex.
+
+ Automatically runs fsck on dest to check that the expected content was
+ provided.
+
+ Example:
+
+ git annex setcontent /tmp/foo.iso foo.iso
+
* unannex [path ...]
Use this to undo an accidental `git annex add` command. You can use
@@ -321,15 +335,6 @@ subdirectories).
git annex dropkey SHA1-s10-7da006579dd64330eb2456001fd01948430572f2
-* setkey file
-
- This plumbing-level command sets the annexed data for a key to the
- content of the specified file, and then removes the file.
-
- Example:
-
- git annex setkey --key=WORM-s3-m1287765018--file /tmp/file
-
# OPTIONS
* --force