zshrc: change editor yet again; gitconfig: add diff --stat alias (dfs)

This commit is contained in:
2018-12-17 16:42:40 +01:00
parent 54024171b1
commit b460e393b2
2 changed files with 2 additions and 1 deletions

View File

@@ -6,6 +6,7 @@
co = checkout co = checkout
cr = codereview cr = codereview
df = diff df = diff
dfs = diff --stat
exclude = !sh -c 'echo "$1" >> .git/info/exclude' - exclude = !sh -c 'echo "$1" >> .git/info/exclude' -
ignored = ls-files --others 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)' 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)'

2
zshrc
View File

@@ -35,7 +35,7 @@ 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=/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 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 mk="make" alias mk="make"