diff --git a/.config/zsh/zshrc.d/30-alias.zsh b/.config/zsh/zshrc.d/30-alias.zsh index 27aa61b..8b3fa06 100644 --- a/.config/zsh/zshrc.d/30-alias.zsh +++ b/.config/zsh/zshrc.d/30-alias.zsh @@ -59,7 +59,6 @@ fi # Git alias g='git' - alias gs='git status --short' alias ga='git add' alias gap='git add -p' alias gc='git commit' @@ -69,16 +68,17 @@ fi alias gd='git diff' alias gds='git diff --staged' alias gf='git fetch' - alias gp='git push' - alias gpush='git push' - alias gpull='git pull' alias gl='glog' alias gll='glog --graph' alias gl{ll,ogg}='glog --graph --branches --remotes' + alias gp='git push' + alias gpull='git pull' + alias gpush='git push' alias gr='git rebase' alias grc='git rebase --continue' alias grcia='git rebase --committer-date-is-author-date' alias gri='git rebase -i' + alias gs='git status --short' alias gss='git stash' # inspired by but modified: # https://nilansanjaya.wordpress.com/2017/06/02/git-find-base-branch/