X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/f4c3514dbaacd4e0ac8fdf9569d6c436cf2589a5..2b089bacf8c00c241fd8529a788641743aa227a0:/zsh/aliases/git.zsh diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh index e8cd9f0..713564e 100644 --- a/zsh/aliases/git.zsh +++ b/zsh/aliases/git.zsh @@ -19,6 +19,7 @@ alias gc='git commit -v' alias gcs='git commit -v --squash' alias gcf='git commit -v --fixup' alias gca='git commit -v -a' +alias gcaf='git commit -v -a --fixup' alias gco='git checkout' alias gcm='git checkout master' @@ -27,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' @@ -46,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'