ssh_config: Use ControlMaster auto.

diff --git a/ssh_config b/ssh_config
index 818f599b6ab5f03db24866405b42a6cbb7365eb1..31c8e6d915282f023369fd7261aaec082d3829fe 100644 (file)
--- a/ssh_config
+++ b/ssh_config
@@ -56,6 +56,11 @@ Host *
 # 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
+# Automatically create a new master session if there's none yet or use an
+# existing one. This way the user doesn't have to use -M to enable a master
+# manually. Don't set this option to "yes" or all SSH commands try to become
+# the master session which is obviously not possible.
+    ControlMaster auto
 
 # Hash hosts in ~/.ssh/known_hosts to try to conceal the known hosts. Doesn't
 # help if the ssh hosts are stored in the shell's history file or in this file