X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/33f3187ce990b48ce747d3dfd36f2a55af053ae3..dcf942832c89d1a80a34bea27e362dbcdc8a6795:/zsh/aliases/git.zsh diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh index 9046d08..1e6c91e 100644 --- a/zsh/aliases/git.zsh +++ b/zsh/aliases/git.zsh @@ -28,7 +28,7 @@ alias gs='git stash save' alias gsa='git stash apply' alias gsp='git stash pop' alias gsd='git stash drop' -alias gsl='git --no-pager stash list' +alias gsl='git --no-pager log -g --oneline --pretty=tformat:"%gd %Cblue%cd %C(auto)%h %s" stash@{0} --date=short' alias gss='git stash show --patch' alias gr='git remote' @@ -38,16 +38,18 @@ alias grrm='git remote remove' alias grset='git remote set-url' alias grup='git remote update' -alias gb='git branch -vv' -alias gba='git branch -a' -alias gbm='git branch --merged' +alias gb='git --no-pager branch' +alias gbv='git --no-pager branch -vv' +alias gba='git --no-pager branch -a' +alias gbm='git --no-pager branch --merged' alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs git branch -d' alias gcl='git config --list' alias gcp='git cherry-pick' alias gcount='git shortlog -sn' -alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short' +alias glg='git --no-pager log --graph --max-count=20 --format="%Cblue%cd %C(auto)%h%d %s" --date=short' +alias glg2='git --no-pager log --graph --max-count=20 --date=short --format="%C(blue)%cd %C(auto)%h %C(dim cyan)%an %C(bold green)(%ar)%C(auto)%-d%n %s"' function glm { glg "${1:-origin}".. } compdef _git glm=git-log alias glgl='git log --graph --cherry-mark --boundary --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'