tadgy/dotfiles
1
0
Fork 0
Code Releases Wiki Activity Actions

Fixing conflicts

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2017-10-19 13:51:14 +01:00
commit c3c6c7850a
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.ssh/config
View file

@ -23,9 +23,9 @@ Host *
# AddKeysToAgent yes
ConnectTimeout 30
# Removed as this prevents use of ^Z suspension.
# ControlMaster auto
# ControlPath ~/.ssh/%u@%l->%r@%h:%p
# ControlPersist 7200
# ControlMaster auto
# ControlPath ~/.ssh/%u@%l->%r@%h:%p
# ControlPersist 7200
ExitOnForwardFailure yes
ForwardX11Trusted no
SendEnv LANG LC_* TERM