lazyvim: absorb icons into rmz.util.ui

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

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index 8f68e814ace29488ce197718af01a716472b36fe..afb16717acf5b9398a58fc5964b9778480ae03dd 100644 (file)
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -9,6 +9,8 @@ alias gup='git pull --rebase'
 
 alias gp='git push'
 alias gpf='git push --force-with-lease'
 
 alias gp='git push'
 alias gpf='git push --force-with-lease'

+alias gpo='gp origin'
+alias gpfo='gpf origin'

 
 alias gd='git diff'
 alias gdc='git diff --cached'
 
 alias gd='git diff'
 alias gdc='git diff --cached'


@@ -40,17 +42,17 @@ alias grrm='git remote remove'
 alias grset='git remote set-url'
 alias grup='git remote update'
 
 alias grset='git remote set-url'
 alias grup='git remote update'
 

-alias gb='git --no-pager branch'
+alias gb='git --no-pager branch -vv'

 alias gbv='git --no-pager branch -vv'
 alias gba='git --no-pager branch -a'
 alias gbv='git --no-pager branch -vv'
 alias gba='git --no-pager branch -a'

-alias gbm='git --no-pager branch --merged'
+alias gbm='git --no-pager branch -vv --merged'

 alias gbdm='git branch --merged | grep -ve "\*" -e "\+" -e "master" | xargs git branch -d'
 alias gsu='git branch --set-upstream-to'
 alias gsum='git branch --set-upstream-to=origin/HEAD'
 
 alias gwl='git worktree list'
 function gwa { git worktree add wt/$1 $1 }
 alias gbdm='git branch --merged | grep -ve "\*" -e "\+" -e "master" | xargs git branch -d'
 alias gsu='git branch --set-upstream-to'
 alias gsum='git branch --set-upstream-to=origin/HEAD'
 
 alias gwl='git worktree list'
 function gwa { git worktree add wt/$1 $1 }

-compdef _git gwa='_git_commits'
+compdef -e '__git_remote_branch_names_noprefix' gwa

 
 alias gcl='git config --list'
 alias gcp='git cherry-pick'
 
 alias gcl='git config --list'
 alias gcp='git cherry-pick'