From aa2a664a13355be66f75e9d151f96912732da4e7 Mon Sep 17 00:00:00 2001 From: za Date: Fri, 11 Oct 2024 16:02:07 +0700 Subject: [PATCH] (plugin) git: Added gmod alias for git merge origin $git_develop_branch Issue: #10117 --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index bcadc4713..088eb85ff 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -116,6 +116,7 @@ plugins=(... git) | `gmc` | `git merge --continue` | | `gms` | `git merge --squash` | | `gmff` | `git merge --ff-only` | +| `gmod` | `git merge origin/$(git_develop_branch)` | | `gmom` | `git merge origin/$(git_main_branch)` | | `gmum` | `git merge upstream/$(git_main_branch)` | | `gmtl` | `git mergetool --no-prompt` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index f34c0726b..1a0664b4e 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -257,6 +257,7 @@ alias gma='git merge --abort' alias gmc='git merge --continue' alias gms="git merge --squash" alias gmff="git merge --ff-only" +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'