diff --git a/gitconfig b/gitconfig index 323982f..64e66db 100644 --- a/gitconfig +++ b/gitconfig @@ -6,6 +6,7 @@ co = checkout cr = codereview df = diff + dfs = diff --stat exclude = !sh -c 'echo "$1" >> .git/info/exclude' - ignored = ls-files --others lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)' diff --git a/zshrc b/zshrc index ef90524..951b992 100644 --- a/zshrc +++ b/zshrc @@ -35,7 +35,7 @@ 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=/usr/bin/vim +export EDITOR=/usr/local/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 mk="make"