diff --git a/gitconfig b/gitconfig index 12ac647..57244d1 100644 --- a/gitconfig +++ b/gitconfig @@ -17,6 +17,7 @@ lola = log --graph --decorate --pretty=oneline --abbrev-commit --all mnc = merge --no-commit oneline = log --oneline --decorate + pr = "!f() { git fetch origin pull/$1/head && git checkout FETCH_HEAD; }; f" pl = pull ps = push repourl = config --get remote.origin.url @@ -69,7 +70,7 @@ excludesfile = /Users/veitheller/.gitignore whitespace = space-before-tabmtrailing-space autocrlf = input - editor = /usr/local/bin/vim + editor = /usr/bin/vim [diff] tool = vimdiff diff --git a/zshrc b/zshrc index f92dc7d..6a2e6b3 100644 --- a/zshrc +++ b/zshrc @@ -35,11 +35,11 @@ export LC_ALL=$LANG export JAVA_HOME=`/usr/libexec/java_home -v 9` export GH_HOME=~/Documents/Code/Github export CARP_DIR=$GH_HOME/carp/Carp/ -export EDITOR=vim +export EDITOR=/usr/bin/vim alias dob="git branch --merged | grep -vE '(\*)|(master)|(dev)' | xargs -n 1 git branch -d" alias vi="stty stop '' -ixoff ; stty erase '^?'; vim" -alias gcc="gcc-8" -alias g++="g++-8" +#alias gcc="gcc-8" +#alias g++="g++-8" alias mk="make" alias g="git" alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py"