diff options
| author |  Tom Willemsen | 2012-10-24 01:36:38 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-24 01:36:38 +0200 |
| commit | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (patch) | |
| tree | 71f06d73cb4139e6a8c8aff91e229a9ff4d58b35 /.ssh | |
| parent | ab3e4c680e329db4c01e6d029874124011328ba1 (diff) | |
| parent | 31d3b87a976a229f444251b871c32dd914330044 (diff) | |
| download | dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.tar.gz dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
.xinitrc
.zprofile
Diffstat (limited to '.ssh')
| -rw-r--r-- | .ssh/config | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.ssh/config b/.ssh/config index eeb6ac6..edace41 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,22 +1,22 @@ -# -*- eval: (git-auto-commit-mode 1) -*- ControlMaster auto ControlPath /tmp/ssh_mux_%h_%p_%r ControlPersist 1m Host 192.168.0.95 -Port 4511 + Port 4511 Host pegas -Port 4511 + Port 4511 Host 82.170.172.156 -Port 4511 + Port 4511 Host anapnea.net -User ryuslash + User ryuslash Host my.aethon.nl -User tom + User tom Host ryuslash.org -Port 4511 + Port 4511 + ForwardAgent yes |