merge dot files

.bash_aliases

@@ -13,7 +13,6 @@ alias uberbake='~/uberbake.txt'
 
 #tools
 alias s='start Source/*.sln'
-alias projects='cd /c/Projects'
 alias resrc='source ~/.bash_aliases && source ~/.bashrc && source ~/.profile'
 alias role='whoami -groups -fo list | grep -i'
 alias fu='find ./ -type f -print0 | xargs -0 grep -n $1'
@@ -31,6 +30,7 @@ alias dlb='dml'
 alias gl='git log --pretty=format:"%h %ar by %an: %s"'
 
 alias mongodps="mongod --config /usr/local/etc/mongod.conf --fork --logpath ~/.docs/mongo.log"
+
 # delete merged local branches
 function dml(){
   for b in `git branch --merged | grep -v \*`; do git branch -D $b; done

.bashrc

@@ -31,6 +31,10 @@ if [ -f ~/.bash_aliases ]; then
 fi
 
 
+# enable programmable completion features
+if [ -f /etc/git_completion ]; then
+    . /etc/git_completion
+fi
 # enable programmable completion features
 if [ -f /etc/git_completion ]; then
     . /etc/git_completion

.dev_profile

@@ -12,10 +12,10 @@ fi
 export GOBIN=${GOPATH}/bin
 PATH=${PATH}:${GOBIN}
 
-export GIT_EDITOR=vim.exe
+export GIT_EDITOR=~/Tools/vim/gvim.exe
 
 # see environ manfile
-export EDITOR=gvim       # Default Editor
+export EDITOR=$GIT_EDITOR       # Default Editor
 export VISUAL=$EDITOR   # Visual not really used differently from EDITOR anymore
 export LESS='-iMR'      # Case insensite search, verbose prompting and raw output
 export PAGER=less       # Used to display text / man files

.gitconfig

@@ -44,7 +44,6 @@
 [difftool "p4diff"]
 	cmd=p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote  $BASE $LOCAL $REMOTE
 
-
 [merge]
 	tool = p4merge
 
@@ -81,7 +80,7 @@
   # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
   trustctime = false
 	autocrlf = true
-	editor = "EDITOR"
+	editor = "~/Tools/vim/gvim.exe"
 
 [color]
   # Use colors in Git commands that are capable of colored output when
@@ -128,7 +127,6 @@
 	default = current
 [pull]
 	default = current
-
 [user]
 	email = adamveld12@gmail.com
 	name = Adam Veldhousen

.work_profile

@@ -1,7 +1,6 @@
 #!/bin/bash
-
 if [[ $DEBUG ]] ; then
   echo "I'm on my work machine!"
 fi
 
-
+alias projects='cd /c/Projects'