Automated merge with file:///cygdrive/e/srv/hg/skel
authorOleksandr Gavenko <gavenkoa@gmail.com>
Wed, 31 Mar 2010 00:04:06 +0300
changeset 49 4cccbd0d6851
parent 47 918a1b3e1a7e (diff)
parent 48 514847fa6797 (current diff)
child 50 9a89ae1918c4
Automated merge with file:///cygdrive/e/srv/hg/skel
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.ssh/config	Wed Mar 31 00:04:06 2010 +0300
@@ -0,0 +1,6 @@
+
+# Allow sharing of multiple sessions over a single network connection.
+# Also don't prompt for password second time.
+Host *
+ControlPath ~/.ssh/sock/%r@%h:%p
+ControlMaster auto
--- a/Makefile	Tue Mar 23 23:48:10 2010 +0200
+++ b/Makefile	Wed Mar 31 00:04:06 2010 +0300
@@ -12,7 +12,7 @@
   host_os = windows
 endif
 
-ITEMS = .Xdefaults .bashrc .mailsign .xinitrc .mc .vimrc .inputrc
+ITEMS = .Xdefaults .bashrc .mailsign .xinitrc .mc .vimrc .inputrc .ssh
 
 .PHONY: install
 install: