From d8365c862bd88536c108262f4bfeea450128c119 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Dec 2013 13:48:26 -0400 Subject: update plumbing command docs --- doc/git-annex.mdwn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'doc/git-annex.mdwn') diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 99af09e3d..4602849c2 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -727,15 +727,6 @@ subdirectories). point to annexed content. Also handles injecting changes to unlocked files into the annex. -* `update-hook refname olvrev newrev` - - This is meant to be called from git's update hook. `git annex init` - automatically creates an update hook using this. - - This denies updates being pushed for the currently checked out branch. - While receive.denyCurrentBranch normally prevents that, it does - not for fake bare repositories, as used by direct mode. - * `fromkey key file` This plumbing-level command can be used to manually set up a file @@ -756,6 +747,15 @@ subdirectories). * `transferkeys` This plumbing-level command is used by the assistant to transfer data. + It is fed instructions about the keys to transfer using an internal + stdio protocol. + +* `transferkey` + + This plumbing-level command is used to request a single key be + transferred. Either the --from or the --to option can be used to specify + the remote to use. A --file option can be used to hint at the file + associated with the key. * `rekey [file key ...]` -- cgit v1.2.3