diff --git a/zsh/aliases b/zsh/aliases index 6b82e6be..a4e84a25 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -70,7 +70,7 @@ alias gs='git status' alias gco='git checkout' alias gc='git commit' alias gcm='noglob git commit -m' -alias gc='git diff' +alias gd='git diff' alias gp='git push' alias gl='git pull' alias ga='git add' diff --git a/zsh/preztorc b/zsh/preztorc index 6a396ef1..ca52ea55 100644 --- a/zsh/preztorc +++ b/zsh/preztorc @@ -98,13 +98,6 @@ zstyle ':prezto:module:syntax-highlighting' highlighters \ 'pattern' \ 'cursor' \ 'root' -# -# Set syntax highlighting styles. -# zstyle ':prezto:module:syntax-highlighting' styles \ -# 'builtin' 'bg=blue' \ -# 'command' 'bg=blue' \ -# 'function' 'bg=blue' - # Terminal @@ -116,12 +109,3 @@ zstyle ':prezto:module:terminal' auto-title 'yes' # Set the tab title format. # zstyle ':prezto:module:terminal:tab-title' format '%m: %s' - - -# Tmux - -# Auto start a session when Zsh is launched in a local terminal. -#zstyle ':prezto:module:tmux:auto-start' local 'yes' - -# Auto start a session when Zsh is launched in a SSH connection. -#zstyle ':prezto:module:tmux:auto-start' remote 'yes'