diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 99fcc4d07..bd8b7fafb 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -254,7 +254,9 @@ alias gfg='git ls-files | grep' alias gm='git merge' alias gma='git merge --abort' alias gmc='git merge --continue' +alias gmd='git merge $(git_develop_branch)' alias gms="git merge --squash" +alias gmod='git merge origin/$(git_develop_branch)' alias gmom='git merge origin/$(git_main_branch)' alias gmum='git merge upstream/$(git_main_branch)' alias gmtl='git mergetool --no-prompt'