zsh: alias for `git push --force-with-lease`

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

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index 2d1b72e56a2035b6225b8f1ca8fde1999e976cc3..a51ec1ec6747d9cf6611ea6f048a70481d8943a1 100644 (file)
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -8,9 +8,12 @@ alias gl='git pull'
 alias gup='git pull --rebase'
 
 alias gp='git push'
+alias gpf='git push --force-with-lease'
 
 alias gd='git diff'
 alias gdc='git diff --cached'
+function gdm { gd "${1:-origin}".. }
+compdef _git gdm=git-diff
 
 alias gc='git commit -v'
 alias gcs='git commit -v --squash'
@@ -34,10 +37,10 @@ alias grrm='git remote remove'
 alias grset='git remote set-url'
 alias grup='git remote update'
 
-alias gb='git branch'
+alias gb='git branch -vv'
 alias gba='git branch -a'
 alias gbm='git branch --merged'
-alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs -n 1 git branch -d'
+alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs git branch -d'
 
 alias gcl='git config --list'
 alias gcp='git cherry-pick'
@@ -45,6 +48,8 @@ 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 glgg='git log --stat --graph --max-count=20 --decorate'
 alias glgga='git log --stat --graph --decorate --all'