zsh: add `git branch --merged` aliases

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

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index 82addc28782ff0b4dd5ef37f67be7bab3e3b5481..2253a7222d174044042c039ca1d5645011305cd9 100644 (file)
--- 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'
@@ -42,6 +48,8 @@ compdef _git gcp=git-cherry-pick
 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'
 compdef _git glg=git-log
+alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
+compdef _git glgl=git-log
 alias glgg='git log --stat --graph --max-count=20 --decorate'
 compdef _git glgg=git-log
 alias glgga='git log --stat --graph --decorate --all'