git stuff

ackrc

@@ -6,8 +6,11 @@
 --ignore-dir=log
 --ignore-dir=tmp
 --ignore-dir=_srcs
+--ignore-dir=.sass-cache
+
 # we only want to search in scss/sass dirs
 --ignore-dir=css
+
 --sort-files
 
 # search in everything else

gitconfig

@@ -37,8 +37,14 @@
   hub = push origin master
   fac = push origin refac
   subup = submodule foreach git pull
-  rs = reset master --hard
+  rs = reset HEAD --hard
   hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
   lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
   type = cat-file -t
   dump = cat-file -p
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true

vim/bundle/gist

@@ -1 +1 @@
-Subproject commit e1e5e63081e887b86b9113ee1503a379a3f15f6b
+Subproject commit f4854dfb21e5cef738dfc1d9103a19c2c3f0ad40

vim/bundle/supertab

@@ -1 +1 @@
-Subproject commit 12f3dc40fdfa3572a5b923e7a174516d46f2f78c
+Subproject commit 7380c4f0db00992787975f51a3667378fb4cf2ea

vim/bundle/tagbar

@@ -1 +1 @@
-Subproject commit 63e689b64798b0d4cfdcfbea47570b6421b97abe
+Subproject commit 67dc2a3b0633fd10e76d29b5ce66e71ad7b4f96b

vim/bundle/webapi

@@ -1 +1 @@
-Subproject commit 862fa8205f2ec8d9afb2ed86772b4e3fe6e530ca
+Subproject commit f84685fe1273e0312dc5c6252c7e324244a5656b

vimrc

@@ -189,6 +189,9 @@ let NERDTreeMinimalUI=1
 let NERDTreeWinSize=50
 let NERDTreeShowHidden=1
 
+" fugitive shortcuts -- 20+ increases window-height
+nmap <leader>gs :Gstatus<CR><C-w>20+
+nmap <leader>gg :Gcommit<CR><C-w>20+
 
 " ZoomWin configuration
 nnoremap <leader>z :ZoomWin<CR>

zshrc

@@ -3,7 +3,7 @@ ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="webgefrickel"
 
 # default plugins to load
-plugins=(brew git npm node gem osx)
+plugins=(brew cap extract git github history-substring-search jake-node laravel npm node gem osx)
 
 source $ZSH/oh-my-zsh.sh
 unsetopt correct_all