Merge branches 'toolkit-launch' and 'toolkit-git' into toolkit-changes

bin/tcsh.launch

@@ -0,0 +1,16 @@
+#!/bin/sh
+if [ `uname` = "AIX" -a ! -x tcsh ]
+then
+	IBM_CSH=~/cshenv/shells/ibm/bin/tcsh
+	#echo "On an AIX system, so we're using our custom-built TCSH."
+	[ -f ${IBM_CSH} -a -x ${IBM_CSH} ] && exec ${IBM_CSH} $*
+	echo "Failed in trying to start TCSH.  Using a fallback to classic Bourne."
+	exec /bin/sh
+elif [ "" != `which tcsh` -a -f `which tcsh` -a -x `which tcsh` ];
+then
+	#echo "Try using the system TCSH."
+	exec tcsh $*
+else
+	echo "Not going to try starting TCSH.  Using a fallback to classic Bourne."
+	exec /bin/sh
+fi

git/gitconfig

@@ -0,0 +1,37 @@
+[core]
+    whitespace = blank-at-eol,tab-in-indent,space-before-tab,trailing-space,tabwidth=4
+    preloadindex = true
+
+[color]
+    diff = always
+	ui = auto
+
+[alias]
+    br = branch
+    ci = commit
+    co = checkout
+    st = status
+    dc = diff --check
+    brm = !git br -a | grep -e master -e $USER -e review/ -e releases/
+    branch-name = !git branch | awk '/\\*/{print $2}'
+    sd = diff --name-status
+    last = cat-file commit HEAD
+
+[color "branch"]
+    current = green
+
+[color "status"]
+    updated = green
+
+[color "diff"]
+	new = 12
+
+[merge]
+	conflictstyle = diff3
+	mergetool = vimdiff
+	tool = vimdiff
+
+[push]
+	default = upstream
+
+# vim: ft=gitconfig