X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/fa25023586cb94a1abf4fd3ff95ebe7c3c8ead09..34ae8e65b520ac2597c2ea2554534ec4987852ce:/zsh/modules/aliases.zsh?ds=sidebyside diff --git a/zsh/modules/aliases.zsh b/zsh/modules/aliases.zsh index 2db24d9..2037e9e 100644 --- a/zsh/modules/aliases.zsh +++ b/zsh/modules/aliases.zsh @@ -14,7 +14,7 @@ alias ta="tmux attach -t" alias tn="tmux new -s" # Simple python server -alias spawn-server="python -m SimpleHTTPServer" +alias spawn-server="python -m http.server 9000" # Git aliases alias g='git' @@ -22,18 +22,22 @@ alias gst="git status" alias gss="gst --short" alias gL="git log --graph --decorate" alias gc='git commit --verbose' +alias gco='git checkout' alias gl="git pull" alias gm='git merge' alias gp='git push' # Graphicsmagick override -alias grm="/usr/local/bin/gm" +if command -v brew &> /dev/null; then + alias grm="$(brew --prefix)/bin/gm" +fi # JS friendly tree -alias arbol="tree -I 'node_modules|bower_components|doc'" +alias arbol="tree -I 'node_modules|bower_components|doc|__pycache__|\.pyc'" # Load Script Version Managers because they slow alias enable-nvm='source $(brew --prefix nvm)/nvm.sh' alias workon="echo 'DISABLED: run enable-virtualenvwrapper to enable'" alias enable-virtualenvwrapper="unalias workon; source /usr/local/bin/virtualenvwrapper.sh" alias enable-rvm="source $HOME/.rvm/scripts/rvm" +alias t="things.sh"