X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/a15ae55617031038ec8435e7c5c1dcd940c500cc..33f3187ce990b48ce747d3dfd36f2a55af053ae3:/zsh/aliases/git.zsh diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh index dbf552e..9046d08 100644 --- a/zsh/aliases/git.zsh +++ b/zsh/aliases/git.zsh @@ -47,14 +47,15 @@ alias gcl='git config --list' alias gcp='git cherry-pick' alias gcount='git shortlog -sn' -alias glg='git --no-pager log --oneline --graph --max-count=20 --decorate' alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' function glm { glg "${1:-origin}".. } compdef _git glm=git-log -alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' +alias glgl='git log --graph --cherry-mark --boundary --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' alias glgg='git log --stat --graph --max-count=20 --decorate' alias glgga='git log --stat --graph --decorate --all' +alias grl='git --no-pager reflog --max-count=20' + alias ga='git add' alias gm='git merge'