alias for new vim on mac only
This commit is contained in:
parent
c33267ab1b
commit
a0eecb85fd
2 changed files with 6 additions and 0 deletions
4
.zshrc
4
.zshrc
|
@ -13,4 +13,8 @@ promptinit
|
||||||
|
|
||||||
prompt redhat
|
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
|
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
|
||||||
|
|
|
@ -25,3 +25,5 @@
|
||||||
[mergetool "sourcetree"]
|
[mergetool "sourcetree"]
|
||||||
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
||||||
trustExitCode = true
|
trustExitCode = true
|
||||||
|
[push]
|
||||||
|
default = simple
|
||||||
|
|
Loading…
Reference in a new issue