From 4143e62143c61e71b802dd821abcfcc6660b19c1 Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Sat, 27 Dec 2025 11:48:13 -0300
Subject: [PATCH] feat(git): add new merge aliases for development and main
 branches

---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

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'