aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2017-06-27 14:58:21 +0200
committerDavid Runge <dave@sleepmap.de>2017-06-27 14:58:21 +0200
commit76a00bd86fea1b8ca25371246da8e32e00f8738b (patch)
treeb1b9ecc30cd95dd80ec54c4653c273391b417fc6
parent24e8c2de3e32450acff63af2bad49756dc4dc1ee (diff)
parent72523c9361d626eb7e1649a97769d426b136e3d1 (diff)
downloaddotfiles-76a00bd86fea1b8ca25371246da8e32e00f8738b.tar.gz
dotfiles-76a00bd86fea1b8ca25371246da8e32e00f8738b.tar.bz2
dotfiles-76a00bd86fea1b8ca25371246da8e32e00f8738b.tar.xz
dotfiles-76a00bd86fea1b8ca25371246da8e32e00f8738b.zip
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles: .ssh/config: Removing shared connection for sleepmap, as it apparently leads to tmux sessions being killed on disconnect.
-rw-r--r--.ssh/config2
1 files changed, 0 insertions, 2 deletions
diff --git a/.ssh/config b/.ssh/config
index 3eb25cc..a888924 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -352,8 +352,6 @@ Host sleepmap
IdentityFile ~/.ssh/id_ed25519
ServerAliveInterval 120
Compression yes
- ControlMaster auto
- ControlPath ~/.ssh/socket-%r@%h:%p
Host frqrec
# Hostname 85.10.206.216