Merge branch 'master' of defaria.com:/opt/git/clearscm

Conflicts:
	clearadm/etc/conf.d/clearadm.conf

diff --git a/etc/doskey.mac b/etc/doskey.mac
index 9cae752..4f9dec6 100644 (file)
--- a/etc/doskey.mac
+++ b/etc/doskey.mac
@@ -1,10 +1,13 @@
+;= rem doskey macros to make cmd more Linux like\r
 ls=dir /w $*\r
 ll=dir /n /-c /q /ta $*\r
 ct=cleartool $*\r
-grep=find "$1" $*\r
+grep=findstr $*\r
 rm=del $*\r
 cp=copy $*\r
-perl=\\rtnlprod02\viewstore\PMO\CM_TOOLS\perl\bin\perl $*\r
+cat=type $*\r
+history=doskey /history\r
+asperl=C:\Perl\bin\perl $*\r
 lsvob=cleartool lsvob $*\r
 llvob=cleartool lsvob -long $*\r
 lsview=cleartool lsview $*\r
@@ -53,5 +56,4 @@ llreplica=multitool lsreplica -long -vob $*
 lsepoch=multitool lsepoch -vob $*\r
 llepoch=multitool lsepoch -long -vob $*\r
 chepoch=multitool chepoch -vob $*\r
-syncreplica=multitool syncreplica $*\r
-\r
+syncreplica=multitool syncreplica $*
\ No newline at end of file

diff --git a/rc/sshconfig b/rc/sshconfig
index 1fa25ee..6c6b890 100644 (file)
--- a/rc/sshconfig
+++ b/rc/sshconfig
@@ -1,3 +1,7 @@
 ForwardX11 yes
 #ForwardX11Trusted yes
 StrictHostKeyChecking no
+
+Host *
+  ServerAliveInterval 300
+  ServerAliveCountMax 2