mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-20 00:47:45 +08:00
Code Issues Releases Wiki Activity

(plugin) git: Added gmod alias for git merge origin $git_develop_branch

Browse Source 
Issue: #10117
This commit is contained in:
za 2024-10-11 16:02:07 +07:00
parent 0c8ce9d6ad
commit aa2a664a13
No known key found for this signature in database
GPG Key ID: A9F471412BC97FF4
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/git/README.md
View File

@ -116,6 +116,7 @@ plugins=(... git)
| `gmc` | `git merge --continue` | | `gmc` | `git merge --continue` |
| `gms` | `git merge --squash` | | `gms` | `git merge --squash` |
| `gmff` | `git merge --ff-only` | | `gmff` | `git merge --ff-only` |
| `gmod` | `git merge origin/$(git_develop_branch)` |
| `gmom` | `git merge origin/$(git_main_branch)` | | `gmom` | `git merge origin/$(git_main_branch)` |
| `gmum` | `git merge upstream/$(git_main_branch)` | | `gmum` | `git merge upstream/$(git_main_branch)` |
| `gmtl` | `git mergetool --no-prompt` | | `gmtl` | `git mergetool --no-prompt` |

1
plugins/git/git.plugin.zsh
View File

@ -257,6 +257,7 @@ alias gma='git merge --abort'
alias gmc='git merge --continue' alias gmc='git merge --continue'
alias gms="git merge --squash" alias gms="git merge --squash"
alias gmff="git merge --ff-only" alias gmff="git merge --ff-only"
alias gmod='git merge origin/$(git_develop_branch)'
alias gmom='git merge origin/$(git_main_branch)' alias gmom='git merge origin/$(git_main_branch)'
alias gmum='git merge upstream/$(git_main_branch)' alias gmum='git merge upstream/$(git_main_branch)'
alias gmtl='git mergetool --no-prompt' alias gmtl='git mergetool --no-prompt'