From 0ce02bd2f2ac57fd5827adfd1eca8fb34d46b768 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Wed, 15 Mar 2023 14:34:14 +0000 Subject: [PATCH] [CONFLICT] .ssh/config --- .ssh/config | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.ssh/config b/.ssh/config index ca7521e..f9a6228 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,7 +1,8 @@ -IdentityFile ~/.ssh/id_ecdsa_sk -IdentityFile ~/.ssh/id_ecdsa_sk_backup +IdentityFile ~/.ssh/id_ed25519_sk +IdentityFile ~/.ssh/id_ed25519_sk_secondary Host git.olympuslab.net github.com ControlMaster auto ControlPath ~/.ssh/session.%r@%h:%p - ControlPersist 1d + ControlPersist 5m +