X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=ssh_config;h=78662eef8a37488500a912139ed69dad9840e6cd;hb=3e95c7cbbc9e1f75876a0198cd585d91f7409681;hp=62babfce373192a98a322c11f2018991b53df91d;hpb=0250848fa42b8bfe9396619bb91d94acddf942f8;p=config%2Fdotfiles.git

diff --git a/ssh_config b/ssh_config
index 62babfc..78662ee 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,6 +1,9 @@
 # SSH configuration file.
+#
+# Some options are set even if they are default to prevent /etc/ssh/ssh_config
+# from overwriting them.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +41,8 @@ Host *
 
 # Allow using -M (ControlMaster) to create a master SSH session which
 # "tunnels" other connections to the same host, thus reducing the number of
-# authentications (which are relatively slow) and TCP connections.
+# authentications (which are relatively slow) and TCP connections. The master
+# sockets are stored in ~/.ssh (by default ControlPath is not set).
     ControlPath ~/.ssh/master-%l-%h-%p-%r
 
 # Abort if not all requested port forwardings can be set up.