From: andrew <Andrew@DeFaria.com>
Date: Tue, 13 May 2014 04:20:20 +0000 (-0700)
Subject: Merge branch 'master' of defaria.com:/opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=219f4d8260312ac845ca878de6f26109e67a2ab7;hp=fb487937969f9a8e8b10931d58bfd765f6f96b0c;p=clearscm.git

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

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