diff options
| -rw-r--r-- | Command/TransferKey.hs | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 13 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Command/TransferKey.hs b/Command/TransferKey.hs index 5bb53d98d..41a207080 100644 --- a/Command/TransferKey.hs +++ b/Command/TransferKey.hs @@ -1,5 +1,4 @@ -{- git-annex command, used internally by old versions of assistant; - - kept around for now so running daemons don't break when upgraded +{- git-annex plumbing command (for use by old assistant, and users) - - Copyright 2012 Joey Hess <joey@kitenet.net> - @@ -233,7 +233,7 @@ android: Build/EvilSplicer mkdir -p tmp if ! $(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices; then tail tmp/dump-splices >&2; exit 1; fi echo "Setting up Android build tree.." - ./Build/EvilSplicer tmp/splices tmp/dump-splices standalone/android/evilsplicer-headers.hs + ./Build/EvilSplicer tmp/splices tmp/dump-splices standalone/no-th/evilsplicer-headers.hs rsync -az --exclude tmp --exclude dist . tmp/androidtree # Copy the files with expanded splices to the source tree, but # only if the existing source file is not newer. (So, if a file diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 987e78afb..44a7545b3 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -768,12 +768,6 @@ subdirectories). git annex dropkey SHA1-s10-7da006579dd64330eb2456001fd01948430572f2 -* `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 @@ -781,6 +775,13 @@ subdirectories). the remote to use. A --file option can be used to hint at the file associated with the key. +* `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, which is intentionally not documented (as it may change + at any time). + * `rekey [file key ...]` This plumbing-level command is similar to migrate, but you specify |