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

diff --git a/rc/client_scripts/Axcient b/rc/client_scripts/Axcient
new file mode 100755 (executable)
index 0000000..9d80ec2
--- /dev/null
+++ b/rc/client_scripts/Axcient
@@ -0,0 +1,25 @@
+#!/bin/bash
+################################################################################
+#
+# File:         $RCSfile: Axcient,v $
+# Revision:    $Revision: $
+# Description: Client specific start up for Axcient
+# Author:       Andrew@DeFaria.com
+# Created:     Tue Aug 13 11:49:46 PDT 2013
+# Modified:     $Date: $
+# Language:     bash
+#
+# (c) Copyright 2013, Andrew@DeFaria.com, all rights reserved.
+#
+################################################################################
+function git () {
+  # Need to reset title since we put the branch name in the titlebar
+  git=$(which git)
+
+  if [ "$1" = "checkout" ]; then
+    $git $@
+    set_title
+  else
+    $git $@
+  fi
+} # git

diff --git a/rc/functions b/rc/functions
index c27274b..89bfb9f 100644 (file)
--- a/rc/functions
+++ b/rc/functions
@@ -55,7 +55,7 @@ function title_bar {
 
   # Add GIT info if available
   if in_git_repo; then
-    current_dir="git: $(git branch | sed -n -e 's/^\* \(.*\)/\1/p') $current_dir"
+    current_dir="$current_dir [git: $(git branch | sed -n -e 's/^\* \(.*\)/\1/p')]"
   fi
 
   if [ "$TERM" = "hpterm" -o \