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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2013-05-04 17:10:47 -04:00
commit 878096d80b
2 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/assistant/local_pairing_walkthrough/comment_4_f6bf82c263fefe38701709d9dbd974cc._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 4"
date="2013-05-04T16:39:23Z"
content="""
Local pairing uses UDP port 55556. This is sent to multicast address 224.0.0.251 (same used by Avahi).
(You also need TCP port 22 open for ssh.)
"""]]

22
doc/special_remotes/rsync.mdwn
View file

@ -36,3 +36,25 @@ These parameters can be passed to `git annex initremote` to configure rsync:
The `annex-rsync-options` git configuration setting can be used to pass
parameters to rsync.
## annex-rsync-transport
You can use the `annex-rsync-transport` git configuration setting to choose
whether we run rsync over ssh or rsh. This setting is also used to specify
parameters that git annex will pass to ssh/rsh.
ssh is the default transport; if you'd like to run rsync over rsh, modify your
.git/config to include
annex-rsync-transport = rsh
under the appropriate remote.
To pass parameters to ssh/rsh, include the parameters after "rsh" or
"ssh". For example, to configure ssh to use the private key at
`/path/to/private/key`, specify
annex-rsync-transport = ssh -i /path/to/private/key
Note that environment variables aren't expanded here, so for example, you
cannot specify `-i $HOME/.ssh/private_key`.