mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "p2p --link now defaults to setting up a bi-directional link"

Browse source 
This reverts commit 3037feb1bf.

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.
This commit is contained in:
Joey Hess 2016-12-16 18:26:07 -04:00
parent 5779e31cc7
commit 38f9337e16
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
7 changed files with 56 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/git-annex-p2p.mdwn
View file

@ -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)

10
doc/tips/peer_to_peer_network_with_tor.mdwn
View file

@ -56,12 +56,12 @@ peer1 remote:
git annex sync --content peer1
Any number of peers can be connected this way, within reason.
You can also generate an address for this new peer, by running `git annex
p2p --gen-addresses`, and link other peers to that address using `git annex
p2p --link`. It's often useful to link peers up in both directions,
so peer1 is a remote of peer2 and peer2 is a remote of peer1.
(When the second peer links to it, the first peer also
gets a new remote added to it, which points to the second peer.
So, on the first peer, you can also sync with the second peer.
The name of the that remote will be "peer1", or "peer2", etc.)
Any number of peers can be connected this way, within reason.
## starting git-annex remotedaemon