diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
commit | dbab2a06f142894f446f1f66b637242862dcd7bf (patch) | |
tree | c8888e76f39647edad67abd73e74605b1d95b3aa /.ssh | |
parent | bd8512e48b8ca0f44171c06578da7a5f3cd6663f (diff) | |
parent | 344bd61ba0d7d06b3cec6499ef6b4058f9d64626 (diff) |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.emacs
.emacs.d/custom.el
Diffstat (limited to '.ssh')
-rw-r--r-- | .ssh/config | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/.ssh/config b/.ssh/config index c0f6c57..5c271b5 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,5 +1,11 @@ Host * -ControlMaster auto -ControlPath ~/.ssh/master-%r@%h:%p -Protocol 2 -Compression yes + Protocol 2 + ControlMaster auto + ControlPath ~/.ssh/master-%r@%h:%p + Compression yes + +# Parabola Repo Server +Host parabola + Port 1863 + HostName repo.parabolagnulinux.org + User repo |