diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index 4b50077..6e6a4fa 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -251,6 +251,7 @@ alias uuuuu='cd ../../../../..' diffver="$(diff -v | grep -o '\([0-9]\+\.[0-9]\+\)')" if [ ${diffver//\.*/} -ge 3 ] && [ ${diffver//*\./} -ge 4 ]; then alias diff='diff --color' + alias_if zdiff zdiff='zdiff --color' fi ## don't assume the rest of these will exist @@ -314,6 +315,7 @@ alias_if git \ gcam="git commit -v -am" \ gci='git commit --interactive' \ gb='git branch' \ + gbl='git branch --list' \ gco='git checkout' \ glol="git log --graph --decorate --pretty=oneline --abbrev-commit" \ glola="git log --graph --decorate --pretty=oneline --abbrev-commit --all" \