diff --git a/zsh/zshrc b/zsh/zshrc index 40e491a..b0436fe 100755 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -228,6 +228,7 @@ if command_exists git; then alias chp='git cherry-pick' alias d='git diff' alias dc='git diff --cached' + alias dmcr='git diff-merge-conflict-resolution' alias ds='git diff --stat' alias f='git fetch' alias gl='git log' @@ -235,6 +236,7 @@ if command_exists git; then alias gls='git log --stat' alias gup='git update' alias m='git merge' + alias rmb='git remove-merged-branches' alias s='git status -sb' alias st='git stash' alias stl='git stash list'