diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-31 12:47:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-31 12:56:07 -0400 |
| commit | 380839299ea8ffa2c98ce6219e62b979ede0c93b (patch) | |
| tree | 9740bd5a861b9b47b2ee6ed5564a3b221137e115 /doc/git-annex.mdwn | |
| parent | cc1ea8f84463c7e333bfa17a815f250d8d088841 (diff) | |
The fromkey command now takes the key as its first parameter. The --key option is no longer used.
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index abddaa0de..42997e534 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -318,7 +318,7 @@ subdirectories). This is meant to be called from git's pre-commit hook. `git annex init` automatically creates a pre-commit hook using this. -* fromkey 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. @@ -406,10 +406,6 @@ subdirectories). are in the annex, their backend is known and this option is not necessary. -* --key=name - - Specifies a key to operate on. - * -c name=value Used to override git configuration settings. May be specified multiple times. |