summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-03-15 13:51:58 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-03-15 13:51:58 -0400
commit5f7979ffe85e036451bb869e29ca161ad3aa0272 (patch)
treeb32ded92fe379a2d8155534e43a5a96194e2e277 /doc
parent97822392b77b6d6327c1d8f78044e57025032010 (diff)
fromkey --force: Skip test that the key has its content in the annex.
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index de4a580ed..254e0883b 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -957,6 +957,9 @@ subdirectories).
This plumbing-level command can be used to manually set up a file
in the git repository to link to a specified key.
+ Normally, the annex needs to already contain the content object for the
+ key. To override this, use --force.
+
* `dropkey [key ...]`
This plumbing-level command drops the annexed data for the specified