X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/b2f5fd5c2348eab8d4630fd57f46f79204dc6f1c..c6a94b49c00ea320c67909cbe0d2df2f95d4fbb9:/zsh/aliases/git.zsh diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh index f18d884..50bf5cb 100644 --- a/zsh/aliases/git.zsh +++ b/zsh/aliases/git.zsh @@ -14,6 +14,8 @@ alias gd='git diff' alias gdc='git diff --cached' function gdm { gd "${1:-origin}".. } compdef _git gdm=git-diff +function gdf { gd $(git merge-base --fork-point $1) } +compdef _git gdf=git-diff alias gc='git commit -v' alias gcs='git commit -v --squash' @@ -38,9 +40,10 @@ 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'