diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-16 18:26:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-16 18:26:07 -0400 |
| commit | 82bb3565a3b4ae4442d006b06c1bd487cba783a8 (patch) | |
| tree | 6d7681bed722e263a67770852930bdd1754e07b5 /doc/git-annex-p2p.mdwn | |
| parent | 097c82b17ed0f3c96d1ca1617f42c39650dc9ab2 (diff) | |
Revert "p2p --link now defaults to setting up a bi-directional link"
This reverts commit 6aa7e136b5d246228723f4c9996bda11f66c4445.
On second thought, this was an overcomplication of what should be the
lowest-level primitive. Let's build bi-directional links at the pairing
level with eg magic wormhole.
Diffstat (limited to 'doc/git-annex-p2p.mdwn')
| -rw-r--r-- | doc/git-annex-p2p.mdwn | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/doc/git-annex-p2p.mdwn b/doc/git-annex-p2p.mdwn index dcfb36a3f..6c50c9dd2 100644 --- a/doc/git-annex-p2p.mdwn +++ b/doc/git-annex-p2p.mdwn @@ -24,26 +24,18 @@ services. * `--link` - Sets up a link with a peer over the P2P network. + Sets up a git remote that is accessed over a P2P network. This will prompt for an address to be entered; you should paste in the address that was generated by --gen-address in the remote repository. - A git remote will be created, with a name like "peer1", "peer2" - by default (the `--name` option can be used to specify the name). - - The link is bi-directional, so the peer will also have a git - remote added to it, linking back to the repository where this is run. + Defaults to making the git remote be named "peer1", "peer2", + etc. This can be overridden with the `--name` option. * `--name` Specify a name to use when setting up a git remote. -* `--one-way` - - Use with `--link` to create a one-way link with a peer, rather than the - default bi-directional link. - # SEE ALSO [[git-annex]](1) |