]> git.madduck.net Git - etc/ssh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / ssh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: ce6ddcc)
Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh
authormartin f. krafft <madduck@madduck.net>
Thu, 27 Oct 2011 19:21:02 +0000 (21:21 +0200)
committermartin f. krafft <madduck@madduck.net>
Thu, 27 Oct 2011 19:21:02 +0000 (21:21 +0200)
Conflicts:
.ssh/config.in

.ssh/config.in patch | blob | history

diff --git a/.ssh/config.in b/.ssh/config.in
index f93c26363c1e2fa68dd0184d8c2214508c8d11a5..67ff7e7578f3cba7146fe9ecef48dcb13ab71175 100644 (file)
--- 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
OpenSSH configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.