hellerve/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zshrc & gitconfig: use system vim

Browse Source
This commit is contained in:
Veit Heller
2018-12-04 17:30:35 +01:00
parent 221ebbb243
commit c81487fa28
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gitconfig
View File

@@ -17,6 +17,7 @@
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
mnc = merge --no-commit mnc = merge --no-commit
oneline = log --oneline --decorate oneline = log --oneline --decorate
pr = "!f() { git fetch origin pull/$1/head && git checkout FETCH_HEAD; }; f"
pl = pull pl = pull
ps = push ps = push
repourl = config --get remote.origin.url repourl = config --get remote.origin.url
@@ -69,7 +70,7 @@
excludesfile = /Users/veitheller/.gitignore excludesfile = /Users/veitheller/.gitignore
whitespace = space-before-tabmtrailing-space whitespace = space-before-tabmtrailing-space
autocrlf = input autocrlf = input
editor = /usr/local/bin/vim editor = /usr/bin/vim
[diff] [diff]
tool = vimdiff tool = vimdiff

6
zshrc
View File

@@ -35,11 +35,11 @@ export LC_ALL=$LANG
export JAVA_HOME=`/usr/libexec/java_home -v 9` export JAVA_HOME=`/usr/libexec/java_home -v 9`
export GH_HOME=~/Documents/Code/Github export GH_HOME=~/Documents/Code/Github
export CARP_DIR=$GH_HOME/carp/Carp/ 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 dob="git branch --merged | grep -vE '(\*)|(master)|(dev)' | xargs -n 1 git branch -d"
alias vi="stty stop '' -ixoff ; stty erase '^?'; vim" alias vi="stty stop '' -ixoff ; stty erase '^?'; vim"
alias gcc="gcc-8" #alias gcc="gcc-8"
alias g++="g++-8" #alias g++="g++-8"
alias mk="make" alias mk="make"
alias g="git" alias g="git"
alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py" alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py"