Merge remote-tracking branch 'branchable/master'

This commit is contained in:
Joey Hess 2011-03-19 14:39:36 -04:00
commit 1de3cbbef1
2 changed files with 2 additions and 2 deletions

View file

@ -9,4 +9,4 @@ One solution is to enable *PermitUserEnvironment yes* in `/etc/sshd_config` and
PATH=/Users/jtang/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin:/usr/X11/bin:/Users/jtang/.cabal/bin:/opt/local/libexec/gnubin
If the above is not done, cloning from the OSX host will fail if git is not installed isn't /usr/bin (which it probably won't be).
If the above is not done, cloning from the OSX host will fail if git is not installed in /usr/bin (which it probably won't be).

View file

@ -9,7 +9,7 @@ dyld: could not load inserted library: /opt/local/lib/libtsocks.dylib
error: git-annex died of signal 5
</pre>
The side effect of this means that users who are behind restrictive firewalls that allow only ssh via a socks proxy, they will need to configure ssh to use something like "http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html".
The side effect of this means that users who are behind restrictive firewalls that allow only ssh via a socks proxy, they will need to configure ssh to use something like <http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html>.
<pre>
host remotemyhost