From a0eecb85fd8129d73efc5a971c6f2b9da996f5c4 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 9 Oct 2013 11:19:02 +0200
Subject: [PATCH] alias for new vim on mac only

---
 .zshrc        | 4 ++++
 gitconfig_mac | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.zshrc b/.zshrc
index a492bf6b..c8254483 100644
--- a/.zshrc
+++ b/.zshrc
@@ -13,4 +13,8 @@ promptinit
 
 prompt redhat
 
+if [[ `uname` == 'Darwin' ]]; then
+	alias vim=/usr/local/Cellar/vim/7.4/bin/vim
+fi
+
 PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
diff --git a/gitconfig_mac b/gitconfig_mac
index ada24b04..3342d946 100644
--- a/gitconfig_mac
+++ b/gitconfig_mac
@@ -25,3 +25,5 @@
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true
+[push]
+	default = simple