X-Git-Url: https://git.madduck.net/etc/ssh.git/blobdiff_plain/4627bd39b7b57c35e326e750e49622ed1df2965d..dc07e6c5c6245f67b1add9b5eb3596f01e41968b:/.ssh/config.in

diff --git a/.ssh/config.in b/.ssh/config.in
index 5e609af..67ff7e7 100644
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@ -92,9 +92,17 @@ Host madduck.net
 Host imap.madduck.net
   HostKeyAlias seamus.madduck.net
 
+Host diamond.madduck.net | diamond
+  ForwardAgent yes
+<<<<<<< HEAD
+  Hostname bell.madduck.net
+
 Host diamond.madduck.net | diamond
   ForwardAgent yes
   Hostname diamond.madduck.net
+Host scratch.madduck.net | scratch
+  User madduck
+  HostKeyAlias diamond.madduck.net
 Host tunes.madduck.net | tunes
   AddressFamily inet
   ControlMaster no
@@ -105,9 +113,6 @@ Host flics.madduck.net | flics
   ControlMaster no
   Hostname flics.madduck.net
   HostKeyAlias diamond.madduck.net
-Host scratch.madduck.net | scratch
-  User madduck
-  HostKeyAlias diamond.madduck.net
 
 Host shelter.madduck.net | shelter
   ForwardAgent yes
@@ -183,8 +188,8 @@ Host auge-fr.no-ip.org | auge
   Hostname auge-fr.no-ip.org
   HostKeyAlias helena.home.mjollnir.org
 
-Host mother.gauting.madduck.net | mother
-  Hostname mother.gauting.madduck.net
+Host mother.gauting | mother | mother.gauting.madduck.net
+  Hostname mother.gauting
   ForwardAgent yes
   ForwardX11 yes
 Host mothere