From d3d5e12222e8010d220db6658e755c2a1c481686 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Thu, 10 Mar 2022 22:27:20 +0100
Subject: [PATCH] [Emacs] Let SSH manage the ControlMaster options

---
 org/config/emacs.org | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/org/config/emacs.org b/org/config/emacs.org
index aba2bf8..f0cca0a 100644
--- a/org/config/emacs.org
+++ b/org/config/emacs.org
@@ -3366,7 +3366,9 @@ supported natively. I will describe them here.
 (use-package tramp
   :straight (tramp :type built-in :build t)
   :init
-  <<tramp-add-yadm>>)
+  <<tramp-add-yadm>>
+  :config
+  (setq tramp-ssh-controlmaster-options ""))
 #+end_src
 
 **** Yadm