git aliases and vim hidden buffers

bashrc

@@ -1,10 +1,11 @@
 # .bashrc
 
-complete  -C /usr/share/ant/bin/complete-ant-cmd.pl ant
+. /etc/bash_completion
 
 # User specific aliases and functions
 export JAVA_HOME=/usr/lib/jvm/java-6-sun
 export PATH=$PATH:/scratch/duncang/tools/bin
+export GIT_TEMPLATE_DIR=~/.git_template/
 alias grep='grep --color=auto'
 alias ls='ls --color'
 alias tomcat='cd /scratch/duncang/tools/tomcat'
@@ -13,14 +14,15 @@ alias tools='cd /scratch/duncang/tools'
 alias jgrep='grep -ir --include=*.{java,js,css,xml,as,jsp, jspf}'
 alias ggrep='grep -ir --exclude-dir=.svn'
 alias js="java -cp /scratch/duncang/tools/rhino/js.jar:/scratch/duncang/tools/rhino/jline.jar jline.ConsoleRunner org.mozilla.javascript.tools.shell.Main -opt -1"
-alias u="svn up"
-alias s="svn status"
+alias u="git pull upstream develop"
+alias s="git status"
 alias bp='mplayer ~/Downloads/beep-6.wav >/dev/null 2>&1'
 alias fb='fbcli --user duncang@we7.com --url we7.fogbugz.com --password M4ng1£Wurz1e'
 alias rt='restartTomcat; restartTomcat6'
 alias rtd='restartTomcatDebug; restartTomcat6Debug'
 alias rebuildTestDatabase='ant rebuild-databases -Dconfig=test'
 alias diff='meld'
+alias ack='ack-grep'
 
 export PAGER="/bin/sh -c \"unset PAGER;col -b -x | \
     vim -R -c 'set ft=man nomod nolist' -c 'map q :q<CR>' \

vimrc

@@ -25,6 +25,8 @@ set backspace=indent,eol,start
 
 let $PAGER='' " needed for using vim as man page viewer
 
+set hidden " don't have to save to change buffers - should retain undo history
+
 " Wildmenu
 if has("wildmenu")
   set wildignore+=*.a,*.o