qutebrowser: bind gl/gr to move between tabs

[dotfiles.git] / zsh / aliases / git.zsh

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index 1e6c91e9baafda0ecefa94be0930e0e66f6c6a1b..750fb8c72de08fb72bfeed237108e265c24de010 100644 (file)
--- 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'
@@ -42,7 +44,7 @@ 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 gbdm='git branch --merged | grep -ve "\*" -e "\+" -e "master" | xargs git branch -d'
 
 alias gcl='git config --list'
 alias gcp='git cherry-pick'