X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/3ca172b5e1d44a813e74c05fa056318e26ff5a67..41fef17e06af7efd5b5d665fc09418eb4d2e0243:/zsh/aliases/git.zsh

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index f2673a3..2253a72 100644
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -13,6 +13,10 @@ alias gd='git diff'
 alias gdc='git diff --cached'
 alias gc='git commit -v'
 compdef _git gc=git-commit
+alias gcs='git commit -v --squash'
+compdef _git gcs=git-commit
+alias gcf='git commit -v --fixup'
+compdef _git gcf=git-commit
 alias gca='git commit -v -a'
 compdef _git gca=git-commit
 alias gco='git checkout'
@@ -34,6 +38,8 @@ alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef _git gba=git-branch
+alias gbm='git branch --merged'
+alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs -n 1 git branch -d'
 alias gcount='git shortlog -sn'
 compdef gcount=git
 alias gcl='git config --list'